projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- fix initialization of globals
[m6w6/ext-http]
/
http.c
diff --git
a/http.c
b/http.c
index 61ee3e7f7b951e877db2b1ec50e7d25aed8b9145..73d6f87283798cb7a9783beb3f8659520d448123 100644
(file)
--- a/
http.c
+++ b/
http.c
@@
-29,6
+29,7
@@
#include "php_http_std_defs.h"
#include "php_http_api.h"
#include "php_http_send_api.h"
#include "php_http_std_defs.h"
#include "php_http_api.h"
#include "php_http_send_api.h"
+#include "php_http_cache_api.h"
#ifdef HTTP_HAVE_CURL
# include "php_http_request_api.h"
#endif
#ifdef HTTP_HAVE_CURL
# include "php_http_request_api.h"
#endif
@@
-133,9
+134,13
@@
zend_module_entry http_module_entry = {
int http_module_number;
/* {{{ http_globals */
int http_module_number;
/* {{{ http_globals */
-static
inline void http_globals_init
(zend_http_globals *G)
+static
void http_globals_init_once
(zend_http_globals *G)
{
memset(G, 0, sizeof(zend_http_globals));
{
memset(G, 0, sizeof(zend_http_globals));
+}
+
+static inline void http_globals_init(zend_http_globals *G)
+{
G->send.buffer_size = HTTP_SENDBUF_SIZE;
zend_hash_init(&G->request.methods.custom, 0, NULL, ZVAL_PTR_DTOR, 0);
#ifdef HTTP_HAVE_CURL
G->send.buffer_size = HTTP_SENDBUF_SIZE;
zend_hash_init(&G->request.methods.custom, 0, NULL, ZVAL_PTR_DTOR, 0);
#ifdef HTTP_HAVE_CURL
@@
-148,8
+153,8
@@
static inline void http_globals_init(zend_http_globals *G)
static inline void http_globals_free(zend_http_globals *G)
{
static inline void http_globals_free(zend_http_globals *G)
{
- STR_
FREE(G->send.content_type
);
- STR_
FREE(G->send.unquoted_etag
);
+ STR_
SET(G->send.content_type, NULL
);
+ STR_
SET(G->send.unquoted_etag, NULL
);
zend_hash_destroy(&G->request.methods.custom);
#ifdef HTTP_HAVE_CURL
zend_llist_clean(&G->request.copies.strings);
zend_hash_destroy(&G->request.methods.custom);
#ifdef HTTP_HAVE_CURL
zend_llist_clean(&G->request.copies.strings);
@@
-190,6
+195,7
@@
PHP_INI_BEGIN()
#ifdef ZEND_ENGINE_2
HTTP_PHP_INI_ENTRY("http.only_exceptions", "0", PHP_INI_ALL, OnUpdateBool, only_exceptions)
#endif
#ifdef ZEND_ENGINE_2
HTTP_PHP_INI_ENTRY("http.only_exceptions", "0", PHP_INI_ALL, OnUpdateBool, only_exceptions)
#endif
+ HTTP_PHP_INI_ENTRY("http.etag_mode", "-2", PHP_INI_ALL, OnUpdateLong, etag.mode)
PHP_INI_END()
/* }}} */
PHP_INI_END()
/* }}} */
@@
-199,11
+205,13
@@
PHP_MINIT_FUNCTION(http)
{
http_module_number = module_number;
{
http_module_number = module_number;
-#ifdef ZTS
- ZEND_INIT_MODULE_GLOBALS(http, NULL, NULL)
-#endif
+ ZEND_INIT_MODULE_GLOBALS(http, http_globals_init_once, NULL)
REGISTER_INI_ENTRIES();
REGISTER_INI_ENTRIES();
+
+ HTTP_LONG_CONSTANT("HTTP_ETAG_MD5", HTTP_ETAG_MD5);
+ HTTP_LONG_CONSTANT("HTTP_ETAG_SHA1", HTTP_ETAG_SHA1);
+ HTTP_LONG_CONSTANT("HTTP_ETAG_MHASH", HTTP_ETAG_MHASH);
#ifdef HTTP_HAVE_CURL
if (CURLE_OK != curl_global_init(CURL_GLOBAL_ALL)) {
#ifdef HTTP_HAVE_CURL
if (CURLE_OK != curl_global_init(CURL_GLOBAL_ALL)) {