PHP_FE(http_request_method_exists, NULL)
PHP_FE(http_request_method_name, NULL)
#endif
- PHP_FE(http_auth_basic, NULL)
- PHP_FE(http_auth_basic_cb, NULL)
#ifndef ZEND_ENGINE_2
PHP_FE(http_build_query, NULL)
#endif
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));
+}
+
+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
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);
return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC);
}
+#ifndef ZEND_ENGINE_2
+# define OnUpdateLong OnUpdateInt
+#endif
+
PHP_INI_BEGIN()
HTTP_PHP_INI_ENTRY("http.allowed_methods", "", PHP_INI_ALL, http_update_allowed_methods, request.methods.allowed)
HTTP_PHP_INI_ENTRY("http.cache_log", "", PHP_INI_ALL, OnUpdateString, log.cache)
{
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();
#ifdef ZEND_ENGINE_2
http_util_object_init();
http_message_object_init();
+# ifndef WONKY
http_response_object_init();
+# endif
# ifdef HTTP_HAVE_CURL
http_request_object_init();
http_requestpool_object_init();
http_exception_object_init();
#endif /* ZEND_ENGINE_2 */
-#ifdef ZEND_ENGINE_2
- zend_hash_init_ex(&http_response_statics, 0, NULL, ZVAL_INTERNAL_PTR_DTOR, 1, 0);
- zend_fix_static_properties(http_response_object_ce, &http_response_statics TSRMLS_CC);
-#endif
return SUCCESS;
}
/* }}} */
/* {{{ PHP_MSHUTDOWN_FUNCTION */
PHP_MSHUTDOWN_FUNCTION(http)
{
- zend_hash_destroy(&http_response_statics);
UNREGISTER_INI_ENTRIES();
#ifdef HTTP_HAVE_CURL
curl_global_cleanup();
}
http_globals_init(HTTP_GLOBALS);
- zend_init_static_properties(http_response_object_ce, &http_response_statics TSRMLS_CC);
return SUCCESS;
}
/* }}} */
/* {{{ PHP_RSHUTDOWN_FUNCTION */
PHP_RSHUTDOWN_FUNCTION(http)
{
-#ifdef ZEND_ENGINE_2
- zend_clean_static_properties(http_response_object_ce TSRMLS_CC);
-#endif
http_globals_free(HTTP_GLOBALS);
return SUCCESS;
}