cvs: php-src(PHP_5_0) /sapi/apache2handler sapi_apache2.c

stas Mon Dec 6 13:55:38 2004 EDT Modified files: (Branch: PHP_5_0) /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.40.2.3&r2=1.40.2.4&ty=u Index: php-src/sapi/apache2handler/sapi_apache2.c diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.3 php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.4 --- php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.3 Mon Dec 6 13:52:52 2004 +++ php-src/sapi/apache2handler/sapi_apache2.c Mon Dec 6 13:55:38 2004 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sapi_apache2.c,v 1.40.2.3 2004/12/06 18:52:52 stas Exp $ */ +/* $Id: sapi_apache2.c,v 1.40.2.4 2004/12/06 18:55:38 stas Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -394,7 +394,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; @@ -427,7 +427,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) @@ -506,7 +506,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;