bc1d2c701085d0e03695d0102a51907d php-install_gd_headers.patch

[packages/php.git] / php-bug-35056.patch

diff --git a/php-bug-35056.patch b/php-bug-35056.patch
new file mode 100644 (file)
index 0000000..1f74825
--- /dev/null
+++ b/php-bug-35056.patch
@@ -0,0 +1,21 @@
+diff -urNbB php-4.4.1.org/sapi/apache2handler/sapi_apache2.c php-4.4.1/sapi/apache2handler/sapi_apache2.c
+--- php-4.4.1.org/sapi/apache2handler/sapi_apache2.c   2005-10-12 23:41:36.000000000 +0200
++++ php-4.4.1/sapi/apache2handler/sapi_apache2.c       2005-11-02 18:58:52.000000000 +0100
+@@ -18,7 +18,7 @@
+    +----------------------------------------------------------------------+
+  */
+ 
+-/* $Id$ */
++/* $Id$ */
+ 
+ #include <fcntl.h>
+ 
+@@ -535,7 +535,7 @@
+               if (!parent_req) {
+                       parent_req = ctx->r;
+               }
+-              if (parent_req && strcmp(parent_req->handler, PHP_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SOURCE_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SCRIPT)) {
++              if (parent_req && parent_req->handler && strcmp(parent_req->handler, PHP_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SOURCE_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SCRIPT)) {
+                       if (php_apache_request_ctor(r, ctx TSRMLS_CC)!=SUCCESS) {
+                               zend_bailout();
+                       }