This doesn't seem to be necessary, and causes a leak in case of output_buffering=on

diff --git a/ext/standard/output.c b/ext/standard/output.c
index e1181c273554217310fb968b6dd04077ad5efd70..f115a7bab6c1fb46f7c18f115ddcd2e69a87d7f6 100644 (file)
--- a/ext/standard/output.c
+++ b/ext/standard/output.c
@@ -108,28 +108,16 @@ PHP_RSHUTDOWN_FUNCTION(output);
 zend_module_entry output_module_entry = {
        "PHP_output", 
        php_output_functions, 
-       NULL,                   /* extension-wide startup function */
-       NULL,                   /* extension-wide shutdown function */
-       PHP_RINIT(output),      /* per-request startup function */
-       PHP_RSHUTDOWN(output),  /* per-request shutdown function */
-       NULL,                   /* information function */
-       PHP_GINIT(output),      /* global startup function */
-       NULL,                   /* global shutdown function */
+       NULL,                                   /* extension-wide startup function */
+       NULL,                                   /* extension-wide shutdown function */
+       NULL,                                   /* per-request startup function */
+       NULL,                                   /* per-request shutdown function */
+       NULL,                                   /* information function */
+       PHP_GINIT(output),              /* global startup function */
+       NULL,                                   /* global shutdown function */
        STANDARD_MODULE_PROPERTIES_EX
 };
 
-PHP_RINIT_FUNCTION(output)
-{
-       php_output_startup();
-   
-       return SUCCESS;
-}
-
-PHP_RSHUTDOWN_FUNCTION(output)
-{
-       /* XXX needs filling in */
-       return SUCCESS;
-}
 
 /* Start output layer */
 PHPAPI void php_output_startup()

diff --git a/main/output.c b/main/output.c
index e1181c273554217310fb968b6dd04077ad5efd70..f115a7bab6c1fb46f7c18f115ddcd2e69a87d7f6 100644 (file)
--- a/main/output.c
+++ b/main/output.c
@@ -108,28 +108,16 @@ PHP_RSHUTDOWN_FUNCTION(output);
 zend_module_entry output_module_entry = {
        "PHP_output", 
        php_output_functions, 
-       NULL,                   /* extension-wide startup function */
-       NULL,                   /* extension-wide shutdown function */
-       PHP_RINIT(output),      /* per-request startup function */
-       PHP_RSHUTDOWN(output),  /* per-request shutdown function */
-       NULL,                   /* information function */
-       PHP_GINIT(output),      /* global startup function */
-       NULL,                   /* global shutdown function */
+       NULL,                                   /* extension-wide startup function */
+       NULL,                                   /* extension-wide shutdown function */
+       NULL,                                   /* per-request startup function */
+       NULL,                                   /* per-request shutdown function */
+       NULL,                                   /* information function */
+       PHP_GINIT(output),              /* global startup function */
+       NULL,                                   /* global shutdown function */
        STANDARD_MODULE_PROPERTIES_EX
 };
 
-PHP_RINIT_FUNCTION(output)
-{
-       php_output_startup();
-   
-       return SUCCESS;
-}
-
-PHP_RSHUTDOWN_FUNCTION(output)
-{
-       /* XXX needs filling in */
-       return SUCCESS;
-}
 
 /* Start output layer */
 PHPAPI void php_output_startup()