diff options
| author | Stanislav Malyshev <stas@php.net> | 2004-12-06 18:55:16 +0000 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2004-12-06 18:55:16 +0000 |
| commit | 9ab7598560f07cc6deec5820015fda5cee3dd130 (patch) | |
| tree | 545b9ad0d7dd76e177a469c1d32d98c9af36dac9 | |
| parent | a21c4e544fae455fe998457945647f2de9f4f4d2 (diff) | |
| download | php-git-9ab7598560f07cc6deec5820015fda5cee3dd130.tar.gz | |
fix startup - if startup did not succeed, do not continue with execution
| -rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index 2075339a8f..62f476f35d 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -399,7 +399,7 @@ static apr_status_t php_server_context_cleanup(void *data_) 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 @@ static void php_apache_request_ctor(request_rec *r, php_struct *ctx TSRMLS_DC) 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 @@ zend_first_try { 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; |