summaryrefslogtreecommitdiff
path: root/sapi/apache_hooks/mod_php5.c
diff options
context:
space:
mode:
Diffstat (limited to 'sapi/apache_hooks/mod_php5.c')
-rw-r--r--sapi/apache_hooks/mod_php5.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/sapi/apache_hooks/mod_php5.c b/sapi/apache_hooks/mod_php5.c
index d27b51b03..0635e1c05 100644
--- a/sapi/apache_hooks/mod_php5.c
+++ b/sapi/apache_hooks/mod_php5.c
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski <zeev@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: mod_php5.c,v 1.4 2004/07/14 09:55:24 sesser Exp $ */
+/* $Id: mod_php5.c,v 1.4.2.2 2005/06/20 12:46:52 tony2001 Exp $ */
#include "php_apache_http.h"
@@ -95,7 +95,7 @@ static CONST_PREFIX char *php_apache_admin_flag_handler(cmd_parms *cmd, php_per_
module MODULE_VAR_EXPORT php5_module;
int saved_umask;
-//static int setup_env = 0;
+/* static int setup_env = 0; */
static unsigned char apache_php_initialized;
typedef struct _php_per_dir_entry {
@@ -340,9 +340,7 @@ static int sapi_apache_header_handler(sapi_header_struct *sapi_header, sapi_head
*p = ':'; /* a well behaved header handler shouldn't change its original arguments */
- efree(sapi_header->header);
-
- return 0; /* don't use the default SAPI mechanism, Apache duplicates this functionality */
+ return SAPI_HEADER_ADD;
}
/* }}} */