rasmus Mon Jul 25 16:36:37 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src NEWS
/php-src/sapi/apache2handler sapi_apache2.c
Log:
Fix for bug #33690
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.920.2.18&r2=1.1247.2.920.2.19&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.18 php-src/NEWS:1.1247.2.920.2.19
--- php-src/NEWS:1.1247.2.920.2.18 Wed Jul 20 15:26:30 2005
+++ php-src/NEWS Mon Jul 25 16:36:32 2005
@@ -1,6 +1,7 @@
PHP 4 NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2005, Version 4.4.1
+- Fixed bug #33690 (Crash setting some ini directives in httpd.conf). (Rasmus)
- Fixed bug #33673 (Added detection for partially uploaded files). (Ilia)
- Fixed bug #33648 (Using --with-regex=system causes compile failure). (Andrei)
- Fixed bug #33156 (cygwin version of setitimer doesn't accept ITIMER_PROF).
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.1.2.40&r2=1.1.2.40.2.1&ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.40
php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.40.2.1
--- php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.40 Fri Apr 8 16:35:02 2005
+++ php-src/sapi/apache2handler/sapi_apache2.c Mon Jul 25 16:36:36 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.1.2.40 2005/04/08 20:35:02 sniper Exp $ */
+/* $Id: sapi_apache2.c,v 1.1.2.40.2.1 2005/07/25 20:36:36 rasmus Exp $ */
#include <fcntl.h>
@@ -454,6 +454,21 @@
TSRMLS_FETCH();
conf = ap_get_module_config(r->per_dir_config, &php4_module);
+
+ /* apply_config() needs r in some cases, so allocate server_context
early */
+ ctx = SG(server_context);
+ if (ctx == NULL) {
+ ctx = SG(server_context) = apr_pcalloc(r->pool, sizeof(*ctx));
+ /* register a cleanup so we clear out the SG(server_context)
+ * after each request. Note: We pass in the pointer to the
+ * server_context in case this is handled by a different thread.
+ */
+ apr_pool_cleanup_register(r->pool, (void *)&SG(server_context),
php_server_context_cleanup, apr_pool_cleanup_null);
+ ctx->r = r;
+ ctx = NULL; /* May look weird to null it here, but it is to
catch the right case in the first_try later on */
+ } else {
+ ctx->r = r;
+ }
apply_config(conf);
if (strcmp(r->handler, PHP_MAGIC_TYPE) && strcmp(r->handler,
PHP_SOURCE_MAGIC_TYPE) && strcmp(r->handler, PHP_SCRIPT)) {
@@ -511,17 +526,9 @@
zend_first_try {
- ctx = SG(server_context);
if (ctx == NULL) {
- ctx = SG(server_context) = apr_pcalloc(r->pool, sizeof(*ctx));
- /* register a cleanup so we clear out the SG(server_context)
- * after each request. Note: We pass in the pointer to the
- * server_context in case this is handled by a different thread.
- */
- apr_pool_cleanup_register(r->pool, (void *)&SG(server_context),
php_server_context_cleanup, apr_pool_cleanup_null);
-
- ctx->r = r;
brigade = apr_brigade_create(r->pool,
r->connection->bucket_alloc);
+ ctx = SG(server_context);
ctx->brigade = brigade;
if (php_apache_request_ctor(r, ctx TSRMLS_CC)!=SUCCESS) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
