@@ -57,8 +57,8 @@ zend_module_entry xsl_module_entry = {
57
57
xsl_functions ,
58
58
PHP_MINIT (xsl ),
59
59
PHP_MSHUTDOWN (xsl ),
60
- PHP_RINIT ( xsl ), /* Replace with NULL if there's nothing to do at request start */
61
- PHP_RSHUTDOWN ( xsl ), /* Replace with NULL if there's nothing to do at request end */
60
+ NULL ,
61
+ NULL ,
62
62
PHP_MINFO (xsl ),
63
63
#if ZEND_MODULE_API_NO >= 20010901
64
64
"0.1" , /* Replace with version number for your extension */
@@ -170,6 +170,7 @@ PHP_MINIT_FUNCTION(xsl)
170
170
xsltRegisterExtModuleFunction ((const xmlChar * ) "function" ,
171
171
(const xmlChar * ) "http://php.net/xsl" ,
172
172
xsl_ext_function_object_php );
173
+ xsltSetGenericErrorFunc (NULL , php_libxml_error_handler );
173
174
174
175
REGISTER_LONG_CONSTANT ("XSL_CLONE_AUTO" , 0 , CONST_CS | CONST_PERSISTENT );
175
176
REGISTER_LONG_CONSTANT ("XSL_CLONE_NEVER" , -1 , CONST_CS | CONST_PERSISTENT );
@@ -273,7 +274,7 @@ PHP_MSHUTDOWN_FUNCTION(xsl)
273
274
(const xmlChar * ) "http://php.net/xsl" );
274
275
xsltUnregisterExtModuleFunction ((const xmlChar * ) "function" ,
275
276
(const xmlChar * ) "http://php.net/xsl" );
276
-
277
+ xsltSetGenericErrorFunc ( NULL , NULL );
277
278
xsltCleanupGlobals ();
278
279
279
280
UNREGISTER_INI_ENTRIES ();
@@ -282,24 +283,6 @@ PHP_MSHUTDOWN_FUNCTION(xsl)
282
283
}
283
284
/* }}} */
284
285
285
- /* {{{ PHP_RINIT_FUNCTION
286
- */
287
- PHP_RINIT_FUNCTION (xsl )
288
- {
289
- xsltSetGenericErrorFunc (NULL , php_libxml_error_handler );
290
- return SUCCESS ;
291
- }
292
- /* }}} */
293
-
294
- /* {{{ PHP_RSHUTDOWN_FUNCTION
295
- */
296
- PHP_RSHUTDOWN_FUNCTION (xsl )
297
- {
298
- xsltSetGenericErrorFunc (NULL , NULL );
299
- return SUCCESS ;
300
- }
301
- /* }}} */
302
-
303
286
/* {{{ PHP_MINFO_FUNCTION
304
287
*/
305
288
PHP_MINFO_FUNCTION (xsl )
0 commit comments