projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- return error if headers have been already sent
[m6w6/ext-http]
/
http.c
diff --git
a/http.c
b/http.c
index 3e7baeb137242888f1ca33ca470bf7d78f1477e5..192834be53f9476a16060641f9869bddaf8e9fbd 100644
(file)
--- a/
http.c
+++ b/
http.c
@@
-19,21
+19,11
@@
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
-
-#ifdef HTTP_HAVE_CURL
-# ifdef PHP_WIN32
-# include <winsock2.h>
-# endif
-# include <curl/curl.h>
-#endif
-
-#include <ctype.h>
-
#include "php.h"
#include "php.h"
-#include "php_ini.h"
-#include "ext/standard/info.h"
#include "SAPI.h"
#include "SAPI.h"
+#include "php_ini.h"
+#include "ext/standard/info.h"
#include "php_http.h"
#include "php_http_std_defs.h"
#include "php_http.h"
#include "php_http_std_defs.h"
@@
-54,6
+44,15
@@
#include "phpstr/phpstr.h"
#include "phpstr/phpstr.h"
+#ifdef HTTP_HAVE_CURL
+# ifdef PHP_WIN32
+# include <winsock2.h>
+# endif
+# include <curl/curl.h>
+#endif
+
+#include <ctype.h>
+
ZEND_DECLARE_MODULE_GLOBALS(http);
HTTP_DECLARE_ARG_PASS_INFO();
ZEND_DECLARE_MODULE_GLOBALS(http);
HTTP_DECLARE_ARG_PASS_INFO();
@@
-241,9
+240,19
@@
PHP_RINIT_FUNCTION(http)
}
/* }}} */
}
/* }}} */
+static int cleanup_statics(void *p TSRMLS_DC)
+{
+ zval_dtor(*(zval **)p);
+ return 0;
+}
+
/* {{{ PHP_RSHUTDOWN_FUNCTION */
PHP_RSHUTDOWN_FUNCTION(http)
{
/* {{{ PHP_RSHUTDOWN_FUNCTION */
PHP_RSHUTDOWN_FUNCTION(http)
{
+ /* ZE kludge */
+#ifdef ZEND_ENGINE_2
+ zend_hash_apply(http_response_object_ce->static_members, cleanup_statics TSRMLS_CC);
+#endif
http_globals_free(HTTP_GLOBALS);
return SUCCESS;
}
http_globals_free(HTTP_GLOBALS);
return SUCCESS;
}