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

[Stanislav Malyshev]

stas            Mon Dec  6 13:55:17 2004 EDT

  Modified files:              (Branch: PHP_4_3)
    /php-src/sapi/apache2handler        sapi_apache2.c 
  Log:
  fix startup - if startup did not succeed, do not continue with execution
  
  
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.1.2.35&r2=1.1.2.36&ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.35 
php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.36
--- php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.35 Mon Dec  6 13:51:40 2004
+++ php-src/sapi/apache2handler/sapi_apache2.c  Mon Dec  6 13:55:16 2004
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: sapi_apache2.c,v 1.1.2.35 2004/12/06 18:51:40 stas Exp $ */
+/* $Id: sapi_apache2.c,v 1.1.2.36 2004/12/06 18:55:16 stas Exp $ */
 
 #include <fcntl.h>
 
@@ -399,7 +399,7 @@
        return APR_SUCCESS;
 }
 
-static void php_apache_request_ctor(request_rec *r, php_struct *ctx TSRMLS_DC)
+static int php_apache_request_ctor(request_rec *r, php_struct *ctx TSRMLS_DC)
 {
        char *content_type;
        char *content_length;
@@ -432,7 +432,7 @@
                SG(request_info).auth_user = NULL;
                SG(request_info).auth_password = NULL;
        }
-       php_request_startup(TSRMLS_C);
+       return php_request_startup(TSRMLS_C);
 }
 
 static void php_apache_request_dtor(request_rec *r TSRMLS_DC)
@@ -511,7 +511,9 @@
                brigade = apr_brigade_create(r->pool, 
r->connection->bucket_alloc);
                ctx->brigade = brigade;
 
-               php_apache_request_ctor(r, ctx TSRMLS_CC);
+               if (php_apache_request_ctor(r, ctx TSRMLS_CC)!=SUCCESS) {
+                       zend_bailout();
+               }
        } else {
                parent_req = ctx->r;
                ctx->r = r;

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