-some new patches from bugs.php.net

Changed files:
    php-domxml_node.patch -> 1.1
    php-image_c.patch -> 1.1
    php-register_shutdown_function.patch -> 1.1

diff --git a/php-domxml_node.patch b/php-domxml_node.patch
new file mode 100644 (file)
index 0000000..8a28a8d
--- /dev/null
+++ b/php-domxml_node.patch
@@ -0,0 +1,10 @@
+--- php-4.1.1/ext/domxml/php_domxml.c~ Thu Feb 14 15:23:48 2002
++++ php-4.1.1/ext/domxml/php_domxml.c  Thu Feb 14 15:23:48 2002
+@@ -833,6 +833,7 @@
+                       if (Z_TYPE_P(obj) == XML_ENTITY_REF_NODE) {
+                               content = xmlNodeGetContent(nodep);
+                               if (content)
++                                      add_property_long(wrapper, "type", Z_TYPE_P(nodep));
+                                       add_property_stringl(wrapper, "content", (char *) content, strlen(content), 1);
+                       }
+                       break;

diff --git a/php-image_c.patch b/php-image_c.patch
new file mode 100644 (file)
index 0000000..ee6215f
--- /dev/null
+++ b/php-image_c.patch
@@ -0,0 +1,27 @@
+--- php-4.1.1/ext/standard/image.c~    Thu Feb 14 15:40:36 2002
++++ php-4.1.1/ext/standard/image.c     Thu Feb 14 15:40:36 2002
+@@ -323,7 +323,9 @@
+       unsigned int marker;
+       char tmp[2];
+       unsigned char a[4];
+-
++      unsigned short skip;
++      unsigned char *buffer;
++      
+       for (;;) {
+               marker = php_next_marker(socketd, fp, issock);
+               switch (marker) {
+@@ -349,7 +351,12 @@
+                                       result->height = (((unsigned short) a[ 0 ]) << 8) + ((unsigned short) a[ 1 ]);
+                                       result->width  = (((unsigned short) a[ 2 ]) << 8) + ((unsigned short) a[ 3 ]);
+                                       result->channels = FP_FGETC(socketd, fp, issock);
+-
++                                      /* skip component specification parameters */
++                                      skip = result-> channels *3;
++                                      buffer = emalloc(skip);
++                                      FP_FREAD(buffer, (long) skip, socketd, fp, issock);
++                                      efree(buffer);
++                                      
+                                       if (! info) /* if we don't want an extanded info -> return */
+                                               return result;
+                               } else {

diff --git a/php-register_shutdown_function.patch b/php-register_shutdown_function.patch
new file mode 100644 (file)
index 0000000..8a7b3ee
--- /dev/null
+++ b/php-register_shutdown_function.patch
@@ -0,0 +1,19 @@
+--- php-4.1.1/sapi/apache/sapi_apache.c        Sat Aug  4 21:42:45 2001
++++ ../php-4.1.1-changed/php-4.1.1/sapi/apache/sapi_apache.c   Thu Jan 24
+12:08:40 2002
+@@ -89,13 +89,13 @@
+ 
+               (void) php_execute_script(&file_handle TSRMLS_CC);
+       }
+-
++/*
+       AP(in_request) = 0;
+       
+       zend_try {
+               php_request_shutdown(NULL);
+       } zend_end_try();
+-      
++*/    
+       return (OK);
+ }
+ /* }}} */