#endif
/* {{{ http_functions[] */
-function_entry http_functions[] = {
+zend_function_entry http_functions[] = {
PHP_FE(http_test, NULL)
PHP_FE(http_date, NULL)
PHP_FE(http_absolute_uri, NULL)
PHP_FE(http_build_query, NULL)
#endif
PHP_FE(ob_etaghandler, NULL)
- {NULL, NULL, NULL}
+
+ EMPTY_FUNCTION_ENTRY
};
/* }}} */
if (!hash_name) {
ZEND_WRITE("HTTP_ETAG_MD5", lenof("HTTP_ETAG_MD5"));
} else {
- ZEND_WRITE("HTTP_ETAG_MHASH|MHASH_", lenof("HTTP_ETAG_MHASH|MHASH_"));
+ ZEND_WRITE("HTTP_ETAG_MHASH_", lenof("HTTP_ETAG_MHASH_"));
ZEND_WRITE(hash_name, strlen(hash_name));
}
}
PHP_INI_END()
/* }}} */
-
/* {{{ PHP_MINIT_FUNCTION */
PHP_MINIT_FUNCTION(http)
{
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);
-
+ if (SUCCESS != http_cache_global_init()) {
+ return FAILURE;
+ }
+ if (SUCCESS != http_request_method_global_init()) {
+ return FAILURE;
+ }
#ifdef HTTP_HAVE_CURL
- if (CURLE_OK != curl_global_init(CURL_GLOBAL_ALL)) {
+ if (SUCCESS != http_request_global_init()) {
return FAILURE;
}
#endif /* HTTP_HAVE_CURL */
{
UNREGISTER_INI_ENTRIES();
#ifdef HTTP_HAVE_CURL
- curl_global_cleanup();
+ http_request_global_cleanup();
#endif
return SUCCESS;
}
/* {{{ PHP_RSHUTDOWN_FUNCTION */
PHP_RSHUTDOWN_FUNCTION(http)
{
+#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
+ int i, c = zend_hash_num_elements(&HTTP_G(request).methods.custom);
+
+ for (i = 0; i < c; ++i) {
+ http_request_method_unregister(HTTP_MAX_REQUEST_METHOD + i);
+ }
+#endif
http_globals_free(HTTP_GLOBALS);
return SUCCESS;
}