wez Tue Dec 23 15:12:56 2003 EDT
Modified files:
/php-src/ext/tidy tidy.c
Log:
Fix segfault in ZTS mode
Index: php-src/ext/tidy/tidy.c
diff -u php-src/ext/tidy/tidy.c:1.26 php-src/ext/tidy/tidy.c:1.27
--- php-src/ext/tidy/tidy.c:1.26 Fri Dec 19 09:24:59 2003
+++ php-src/ext/tidy/tidy.c Tue Dec 23 15:12:55 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: tidy.c,v 1.26 2003/12/19 14:24:59 iliaa Exp $ */
+/* $Id: tidy.c,v 1.27 2003/12/23 20:12:55 wez Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -690,6 +690,8 @@
PHP_MINIT_FUNCTION(tidy)
{
+ ZEND_INIT_MODULE_GLOBALS(tidy, tidy_globals_ctor, tidy_globals_dtor);
+
REGISTER_INI_ENTRIES();
REGISTER_TIDY_CLASS(doc, NULL);
REGISTER_TIDY_CLASS(node, NULL);
@@ -703,8 +705,6 @@
tidy_object_handlers_doc.cast_object = tidy_doc_cast_handler;
tidy_object_handlers_node.cast_object = tidy_node_cast_handler;
- ZEND_INIT_MODULE_GLOBALS(tidy, tidy_globals_ctor, tidy_globals_dtor);
-
_php_tidy_register_tags(INIT_FUNC_ARGS_PASSTHRU);
_php_tidy_register_attributes(INIT_FUNC_ARGS_PASSTHRU);
_php_tidy_register_nodetypes(INIT_FUNC_ARGS_PASSTHRU);
@@ -739,7 +739,7 @@
php_info_print_table_start();
php_info_print_table_header(2, "Tidy support", "enabled");
php_info_print_table_row(2, "libTidy Library Version", (char
*)tidyReleaseDate());
- php_info_print_table_row(2, "Extension Version", PHP_TIDY_MODULE_VERSION "
($Id: tidy.c,v 1.26 2003/12/19 14:24:59 iliaa Exp $)");
+ php_info_print_table_row(2, "Extension Version", PHP_TIDY_MODULE_VERSION "
($Id: tidy.c,v 1.27 2003/12/23 20:12:55 wez Exp $)");
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
