SOURCES: php4-bug-35056.patch (NEW) - fix segfaults when using php...

[arekm]

Author: arekm                        Date: Wed Nov  9 00:32:50 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fix segfaults when using php script as errordocument script on apache2

---- Files affected:
SOURCES:
   php4-bug-35056.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/php4-bug-35056.patch
diff -u /dev/null SOURCES/php4-bug-35056.patch:1.1
--- /dev/null	Wed Nov  9 01:32:50 2005
+++ SOURCES/php4-bug-35056.patch	Wed Nov  9 01:32:45 2005
@@ -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();
+ 			}
================================================================