cvs: php4 /sapi/apache2handler php_functions.c
| From: | Ilia Alshanetsky | Date: | Tue, 25 Mar 2003 15:35:08 +0000 |
| Subject: | cvs: php4 /sapi/apache2handler php_functions.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-19779@lists.php.net to get a copy of this message | ||
iliaa Tue Mar 25 10:35:08 2003 EDT
Modified files:
/php4/sapi/apache2handler php_functions.c
Log:
Added missing initialization, which causes AP2 to crash on startup in ZTS.
Index: php4/sapi/apache2handler/php_functions.c
diff -u php4/sapi/apache2handler/php_functions.c:1.7 php4/sapi/apache2handler/php_functions.c:1.8
--- php4/sapi/apache2handler/php_functions.c:1.7 Tue Mar 25 06:50:18 2003
+++ php4/sapi/apache2handler/php_functions.c Tue Mar 25 10:35:08 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_functions.c,v 1.7 2003/03/25 11:50:18 edink Exp $ */
+/* $Id: php_functions.c,v 1.8 2003/03/25 15:35:08 iliaa Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -480,6 +480,9 @@
static PHP_MINIT_FUNCTION(apache)
{
+#ifdef ZTS
+ ts_allocate_id(&php_apache2_info_id, sizeof(php_apache2_info_struct), (ts_allocate_ctor) NULL,
NULL);
+#endif
REGISTER_INI_ENTRIES();
return SUCCESS;
}