[PHP-CVS] cvs: php-src(PHP_5_1) /sapi/apache2handler sapi_apache2.c

[Ilia Alshanetsky]

iliaa           Wed Oct 26 11:08:23 2005 EDT

  Modified files:              (Branch: PHP_5_1)
    /php-src/sapi/apache2handler        sapi_apache2.c 
  Log:
  Additional tweaks to the patch for bug #34249.
  
  
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.57.2.4&r2=1.57.2.5&ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.4 
php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.5
--- php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.4 Wed Oct 12 17:24:09 2005
+++ php-src/sapi/apache2handler/sapi_apache2.c  Wed Oct 26 11:08:23 2005
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: sapi_apache2.c,v 1.57.2.4 2005/10/12 21:24:09 tony2001 Exp $ */
+/* $Id: sapi_apache2.c,v 1.57.2.5 2005/10/26 15:08:23 iliaa Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -535,7 +535,10 @@
                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();
                        }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php