+--------------------------------------------------------------------+
*/
-#include "php_http.h"
+#include "php_http_api.h"
+
+#include <php_ini.h>
+#include <ext/standard/info.h>
#include <zlib.h>
+
#if PHP_HTTP_HAVE_CURL
# include <curl/curl.h>
# if PHP_HTTP_HAVE_EVENT
# include <event.h>
# endif
#endif
-#if PHP_HTTP_HAVE_NEON
-# include "neon/ne_utils.h"
-#endif
#if PHP_HTTP_HAVE_SERF
-# include "serf.h"
+# include <serf.h>
#endif
-#include <main/php_ini.h>
-#include <ext/standard/info.h>
-#include <Zend/zend_extensions.h>
-
ZEND_DECLARE_MODULE_GLOBALS(php_http);
#ifdef COMPILE_DL_HTTP
static zend_module_dep http_module_deps[] = {
ZEND_MOD_REQUIRED("spl")
-#if PHP_HTTP_HAVE_HASH
+#ifdef PHP_HTTP_HAVE_HASH
ZEND_MOD_REQUIRED("hash")
#endif
-#if PHP_HTTP_HAVE_ICONV
+#ifdef PHP_HTTP_HAVE_ICONV
ZEND_MOD_REQUIRED("iconv")
#endif
-#if PHP_HTTP_HAVE_EVENT
+#ifdef PHP_HTTP_HAVE_EVENT
ZEND_MOD_CONFLICTS("event")
#endif
{NULL, NULL, NULL, 0}
#endif
#endif
PHP_INI_BEGIN()
- PHP_HTTP_INI_ENTRY("http.etag.mode", "md5", PHP_INI_ALL, OnUpdateString, env.etag_mode)
- PHP_HTTP_INI_ENTRY("http.request_datashare.cookie", "0", PHP_INI_SYSTEM, OnUpdateBool, request_datashare.cookie)
- PHP_HTTP_INI_ENTRY("http.request_datashare.dns", "1", PHP_INI_SYSTEM, OnUpdateBool, request_datashare.dns)
- PHP_HTTP_INI_ENTRY("http.request_datashare.ssl", "0", PHP_INI_SYSTEM, OnUpdateBool, request_datashare.ssl)
- PHP_HTTP_INI_ENTRY("http.request_datashare.connect", "0", PHP_INI_SYSTEM, OnUpdateBool, request_datashare.connect)
+ PHP_HTTP_INI_ENTRY("http.etag.mode", "crc32b", PHP_INI_ALL, OnUpdateString, env.etag_mode)
PHP_HTTP_INI_ENTRY("http.persistent_handle.limit", "-1", PHP_INI_SYSTEM, OnUpdateLong, persistent_handle.limit)
PHP_INI_END()
|| SUCCESS != PHP_MINIT_CALL(http_request)
#if PHP_HTTP_HAVE_CURL
|| SUCCESS != PHP_MINIT_CALL(http_curl)
-#endif
-#if PHP_HTTP_HAVE_NEON
- || SUCCESS != PHP_MINIT_CALL(http_neon)
#endif
|| SUCCESS != PHP_MINIT_CALL(http_request_datashare)
|| SUCCESS != PHP_MINIT_CALL(http_request_method)
#if PHP_HTTP_HAVE_CURL
|| SUCCESS != PHP_MSHUTDOWN_CALL(http_curl)
#endif
-#if PHP_HTTP_HAVE_NEON
- || SUCCESS != PHP_MSHUTDOWN_CALL(http_neon)
-#endif
- || SUCCESS != PHP_MSHUTDOWN_CALL(http_request_datashare)
|| SUCCESS != PHP_MSHUTDOWN_CALL(http_request_factory)
|| SUCCESS != PHP_MSHUTDOWN_CALL(http_persistent_handle)
) {
{
if (0
|| SUCCESS != PHP_RINIT_CALL(http_env)
- || SUCCESS != PHP_RINIT_CALL(http_request_datashare)
#if PHP_HTTP_HAVE_CURL
|| SUCCESS != PHP_RINIT_CALL(http_curl)
#endif
{
if (0
|| SUCCESS != PHP_RSHUTDOWN_CALL(http_env)
- || SUCCESS != PHP_RSHUTDOWN_CALL(http_request_datashare)
) {
return FAILURE;
}
#else
php_info_print_table_row(3, "libcurl", "disabled", "disabled");
#endif
-#if PHP_HTTP_HAVE_NEON
- {
- char ne_v[16] = {0};
- sscanf(ne_version_string(), "neon %15[^ :]", &ne_v[0]);
- php_info_print_table_row(3, "libneon", PHP_HTTP_NEON_VERSION, ne_v);
- }
-#else
- php_info_print_table_row(3, "libneon", "disabled", "disabled");
-#endif
#if PHP_HTTP_HAVE_EVENT
php_info_print_table_row(3, "libevent", PHP_HTTP_EVENT_VERSION, event_get_version());