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

[Jani Taskinen]

sniper          Fri Sep  2 09:51:47 2005 EDT

  Modified files:              (Branch: PHP_5_1)
    /php-src/sapi/apache2handler        sapi_apache2.c 
  Log:
  MFH
  
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.57.2.1&r2=1.57.2.2&ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.1 
php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.2
--- php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.1 Wed Aug 17 21:14:41 2005
+++ php-src/sapi/apache2handler/sapi_apache2.c  Fri Sep  2 09:51:47 2005
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: sapi_apache2.c,v 1.57.2.1 2005/08/18 01:14:41 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.57.2.2 2005/09/02 13:51:47 sniper Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -538,7 +538,7 @@
        } else {
                parent_req = ctx->r;
                /* check if comming due to ErrorDocument */
-               if (parent_req != HTTP_OK) {
+               if (parent_req && parent_req->status != HTTP_OK) {
                        parent_req = NULL;
                        goto normal;
                }

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