Browse Source

fix startup - if startup did not succeed, do not continue with execution

PHP-5.1
Stanislav Malyshev 21 years ago
parent
commit
9baa92c596
  1. 8
      sapi/apache2handler/sapi_apache2.c

8
sapi/apache2handler/sapi_apache2.c

@ -400,7 +400,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;
@ -433,7 +433,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)
@ -512,7 +512,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;

Loading…
Cancel
Save