php.patch 2.2 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192
  1. Index: scripts/phpize.in
  2. --- scripts/phpize.in.orig 2003-11-14 04:21:15.000000000 +0100
  3. +++ scripts/phpize.in 2004-06-11 09:27:51.866609632 +0200
  4. @@ -1,5 +1,25 @@
  5. #! /bin/sh
  6. +PATH="@l_prefix@/bin:@l_prefix@/sbin:$PATH"
  7. +export PATH
  8. +
  9. +prereq_fail=""
  10. +for prereq in autoconf automake libtool; do
  11. + @l_rpm@ --quiet -q $prereq
  12. + if [ $? -ne 0 ]; then
  13. + prereq_fail="$prereq_fail $prereq"
  14. + fi
  15. +done
  16. +if [ ".$prereq_fail" != . ]; then
  17. + ( echo "OpenPKG: ERROR: please install following OpenPKG packages first"
  18. + echo "before running $0:"
  19. + for prereq in $prereq_fail; do
  20. + echo "o $prereq"
  21. + done
  22. + ) | @l_rpmtool@ msg -b -t error
  23. + exit 1
  24. +fi
  25. +
  26. prefix='@prefix@'
  27. phpdir="$prefix/lib/php/build"
  28. includedir="$prefix/include/php"
  29. Index: ext/pdf/pdf.c
  30. --- ext/pdf/pdf.c.orig 2004-02-28 23:58:56 +0100
  31. +++ ext/pdf/pdf.c 2004-07-25 11:35:57 +0200
  32. @@ -240,6 +240,16 @@
  33. ZEND_GET_MODULE(pdf)
  34. #endif
  35. +ZEND_BEGIN_MODULE_GLOBALS(pdf)
  36. +FILE *fp;
  37. +ZEND_END_MODULE_GLOBALS(pdf)
  38. +ZEND_DECLARE_MODULE_GLOBALS(pdf)
  39. +#ifdef ZTS
  40. +#define PDF_G(v) TSRMG(pdf_globals_id, zend_pdf_globals *, v)
  41. +#else
  42. +#define PDF_G(v) (pdf_globals.v)
  43. +#endif
  44. +
  45. /* {{{ _free_pdf_doc
  46. */
  47. static void _free_pdf_doc(zend_rsrc_list_entry *rsrc TSRMLS_DC)
  48. @@ -305,6 +315,15 @@
  49. }
  50. /* }}} */
  51. +/* {{{ pdf_flushwrite_fp
  52. + */
  53. +static size_t pdf_flushwrite_fp(PDF *p, void *data, size_t size)
  54. +{
  55. + FILE *fp = PDF_G(fp);
  56. + return fwrite(data, size, 1, fp);
  57. +}
  58. +/* }}} */
  59. +
  60. /* {{{ pdf_flushwrite
  61. */
  62. static size_t pdf_flushwrite(PDF *p, void *data, size_t size)
  63. @@ -339,8 +358,13 @@
  64. /* {{{ PHP_MINIT_FUNCTION
  65. */
  66. +static void php_pdf_init_globals (zend_pdf_globals *g)
  67. +{
  68. + g->fp = NULL;
  69. +}
  70. PHP_MINIT_FUNCTION(pdf)
  71. {
  72. + ZEND_INIT_MODULE_GLOBALS(pdf, php_pdf_init_globals, NULL);
  73. if ((PDF_get_majorversion() != PDFLIB_MAJORVERSION) ||
  74. (PDF_get_minorversion() != PDFLIB_MINORVERSION)) {
  75. php_error(E_ERROR,"PDFlib error: Version mismatch in wrapper code");
  76. @@ -469,9 +493,8 @@
  77. pdf = PDF_new2(custom_errorhandler, pdf_emalloc, pdf_realloc, pdf_efree, NULL);
  78. if(fp) {
  79. - if (PDF_open_fp(pdf, fp) < 0) {
  80. - RETURN_FALSE;
  81. - }
  82. + PDF_G(fp) = fp;
  83. + PDF_begin_document_callback(pdf, pdf_flushwrite_fp, "");
  84. } else {
  85. PDF_open_mem(pdf, pdf_flushwrite);
  86. }