#define http_globals_free(g) _http_globals_free((g) TSRMLS_CC)
static inline void _http_globals_free(zend_http_globals *G TSRMLS_DC)
{
+ if (G->request.headers) {
+ zend_hash_destroy(G->request.headers);
+ FREE_HASHTABLE(G->request.headers);
+ G->request.headers = NULL;
+ }
STR_SET(G->send.content_type, NULL);
STR_SET(G->send.unquoted_etag, NULL);
}
HTTP_PHP_INI_ENTRY("http.log.composite", "", PHP_INI_ALL, OnUpdateString, log.composite)
HTTP_PHP_INI_ENTRY("http.request.methods.allowed", "", PHP_INI_ALL, http_update_allowed_methods, request.methods.allowed)
HTTP_PHP_INI_ENTRY("http.request.methods.custom", "", PHP_INI_PERDIR|PHP_INI_SYSTEM, OnUpdateString, request.methods.custom.ini)
-#ifdef ZEND_ENGINE_2
+#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
HTTP_PHP_INI_ENTRY("http.request.datashare.cookie", "0", PHP_INI_SYSTEM, OnUpdateBool, request.datashare.cookie)
- HTTP_PHP_INI_ENTRY("http.request.datashare.dns", "0", PHP_INI_SYSTEM, OnUpdateBool, request.datashare.dns)
- HTTP_PHP_INI_ENTRY("http.request.datashare.sll", "0", PHP_INI_SYSTEM, OnUpdateBool, request.datashare.ssl)
+ HTTP_PHP_INI_ENTRY("http.request.datashare.dns", "1", PHP_INI_SYSTEM, OnUpdateBool, request.datashare.dns)
+ HTTP_PHP_INI_ENTRY("http.request.datashare.ssl", "0", PHP_INI_SYSTEM, OnUpdateBool, request.datashare.ssl)
HTTP_PHP_INI_ENTRY("http.request.datashare.connect", "0", PHP_INI_SYSTEM, OnUpdateBool, request.datashare.connect)
#endif
#ifdef HTTP_HAVE_ZLIB
(SUCCESS != PHP_MINIT_CALL(http_url)) ||
#ifdef HTTP_HAVE_CURL
(SUCCESS != PHP_MINIT_CALL(http_request)) ||
+# ifdef ZEND_ENGINE_2
(SUCCESS != PHP_MINIT_CALL(http_request_datashare)) ||
+# endif
#endif /* HTTP_HAVE_CURL */
#ifdef HTTP_HAVE_ZLIB
(SUCCESS != PHP_MINIT_CALL(http_encoding)) ||
{
UNREGISTER_INI_ENTRIES();
#ifdef HTTP_HAVE_CURL
- if ( (SUCCESS != PHP_MSHUTDOWN_CALL(http_request_datashare)) ||
+ if (
+# ifdef ZEND_ENGINE_2
+ (SUCCESS != PHP_MSHUTDOWN_CALL(http_request_datashare)) ||
+# endif
(SUCCESS != PHP_MSHUTDOWN_CALL(http_request))) {
return FAILURE;
}
if ( (SUCCESS != PHP_RINIT_CALL(http_request_method))
#ifdef HTTP_HAVE_ZLIB
|| (SUCCESS != PHP_RINIT_CALL(http_encoding))
+#endif
+#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
+ || (SUCCESS != PHP_RINIT_CALL(http_request_datashare))
#endif
) {
return FAILURE;
#ifdef HTTP_HAVE_ZLIB
|| (SUCCESS != PHP_RSHUTDOWN_CALL(http_encoding))
#endif
- ) {
+#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
+ || (SUCCESS != PHP_RSHUTDOWN_CALL(http_request_datashare))
+#endif
+ ) {
status = FAILURE;
}