#endif
#include "php.h"
+#include "zend_extensions.h"
+
#include "SAPI.h"
#include "php_ini.h"
#include "ext/standard/info.h"
#endif
#ifdef ZEND_ENGINE_2
+# include "php_http_filter_api.h"
# include "php_http_util_object.h"
# include "php_http_message_object.h"
# ifndef WONKY
};
/* }}} */
+/* {{{ http_module_dep */
+#if ZEND_EXTENSION_API_NO >= 220050617
+static zend_module_dep http_module_dep[] = {
+# ifdef HAVE_SPL
+ ZEND_MOD_REQUIRED("spl")
+# endif
+ {NULL, NULL, NULL, 0}
+};
+#endif
+/* }}} */
+
/* {{{ http_module_entry */
zend_module_entry http_module_entry = {
-#if ZEND_MODULE_API_NO >= 20010901
+#if ZEND_EXTENSION_API_NO >= 220050617
+ STANDARD_MODULE_HEADER_EX, NULL,
+ http_module_dep,
+#else
STANDARD_MODULE_HEADER,
#endif
"http",
PHP_RINIT(http),
PHP_RSHUTDOWN(http),
PHP_MINFO(http),
-#if ZEND_MODULE_API_NO >= 20010901
HTTP_PEXT_VERSION,
-#endif
STANDARD_MODULE_PROPERTIES
};
/* }}} */
}
#ifdef ZEND_ENGINE_2
- if ( (SUCCESS != PHP_MINIT_CALL(http_util_object)) ||
+ if ( (SUCCESS != PHP_MINIT_CALL(http_filter)) ||
+ (SUCCESS != PHP_MINIT_CALL(http_util_object)) ||
(SUCCESS != PHP_MINIT_CALL(http_message_object)) ||
# ifndef WONKY
(SUCCESS != PHP_MINIT_CALL(http_response_object)) ||
# endif /* WONKY */
# ifdef HTTP_HAVE_CURL
(SUCCESS != PHP_MINIT_CALL(http_request_object)) ||
- (SUCCESS != PHP_MINIT_CALL(http_requestpool_object)) ||
+ (SUCCESS != PHP_MINIT_CALL(http_requestpool_object))||
# endif /* HTTP_HAVE_CURL */
(SUCCESS != PHP_MINIT_CALL(http_exception_object))) {
return FAILURE;
/* {{{ PHP_RINIT_FUNCTION */
PHP_RINIT_FUNCTION(http)
{
- char *m;
-
- if (m = INI_STR("http.allowed_methods")) {
- http_check_allowed_methods(m, strlen(m));
+ if (HTTP_G(request).methods.allowed) {
+ http_check_allowed_methods(HTTP_G(request).methods.allowed,
+ strlen(HTTP_G(request).methods.allowed));
}
http_globals_init(HTTP_GLOBALS);