diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2005-10-26 15:08:42 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2005-10-26 15:08:42 +0000 |
| commit | 14082e0e095de21951bbb1c717bfa03b8b1e5123 (patch) | |
| tree | 5de83b6fbf5d237fdc8262e16341c6f255bc9402 | |
| parent | 04d1624be9c1d4e8918f30d6cefa4db29522243a (diff) | |
| download | php-git-14082e0e095de21951bbb1c717bfa03b8b1e5123.tar.gz | |
MFB51: Additional tweaks to the patch for bug #34249.
| -rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index 06b7bd912c..c2952c4255 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -535,7 +535,10 @@ zend_first_try { if (!parent_req) { parent_req = ctx->r; } - if (parent_req && strcmp(parent_req->handler, PHP_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SOURCE_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SCRIPT)) { + if (parent_req && parent_req->handler && + strcmp(parent_req->handler, PHP_MAGIC_TYPE) && + strcmp(parent_req->handler, PHP_SOURCE_MAGIC_TYPE) && + strcmp(parent_req->handler, PHP_SCRIPT)) { if (php_apache_request_ctor(r, ctx TSRMLS_CC)!=SUCCESS) { zend_bailout(); } |