File php-4.3.9-ap2misc.patch of Package php4 - j0ke.net Open Build Service

File php-4.3.9-ap2misc.patch of Package php4 (Revision 2604d917ef7de135496ecd0c902cebaf)

Currently displaying revision 2604d917ef7de135496ecd0c902cebaf, show latest

--- php-4.3.9/sapi/apache2handler/sapi_apache2.c.ap2misc
+++ php-4.3.9/sapi/apache2handler/sapi_apache2.c
@@ -420,7 +420,7 @@
 	umask(saved_umask);
 }
 
-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;
@@ -453,7 +453,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)
@@ -542,7 +542,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;
@@ -582,7 +584,6 @@
 			char *mem_usage;
 
 			mem_usage = apr_psprintf(ctx->r->pool, "%u", AG(allocated_memory_peak));
-			AG(allocated_memory_peak) = 0;
 			apr_table_set(r->notes, "mod_php_memory_usage", mem_usage);
 		}
 #endif