#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
};
/* }}} */
return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC);
}
+#undef CASE_HTTP_ETAG_HASH
+#define CASE_HTTP_ETAG_HASH(HASH) \
+ case HTTP_ETAG_##HASH: \
+ ZEND_WRITE("HTTP_ETAG_"#HASH, lenof("HTTP_ETAG_"#HASH)); \
+ break;
PHP_INI_DISP(http_etag_mode_displayer)
{
long value;
switch (value)
{
- case HTTP_ETAG_CRC32:
- ZEND_WRITE("HTTP_ETAG_CRC32", lenof("HTTP_ETAG_CRC32"));
- break;
-
- case HTTP_ETAG_SHA1:
- ZEND_WRITE("HTTP_ETAG_SHA1", lenof("HTTP_ETAG_SHA1"));
- break;
-
- case HTTP_ETAG_MD5:
+#ifdef HTTP_HAVE_HASH_EXT
+ CASE_HTTP_ETAG_HASH(RIPEMD160);
+ CASE_HTTP_ETAG_HASH(RIPEMD128);
+ CASE_HTTP_ETAG_HASH(SHA512);
+ CASE_HTTP_ETAG_HASH(SHA384);
+ CASE_HTTP_ETAG_HASH(SHA256);
+#endif
+ CASE_HTTP_ETAG_HASH(CRC32);
+ CASE_HTTP_ETAG_HASH(SHA1);
#ifndef HTTP_HAVE_MHASH
default:
#endif
- ZEND_WRITE("HTTP_ETAG_MD5", lenof("HTTP_ETAG_MD5"));
- break;
+ CASE_HTTP_ETAG_HASH(MD5);
#ifdef HTTP_HAVE_MHASH
default:
HTTP_PHP_INI_ENTRY("http.redirect_log", "", PHP_INI_ALL, OnUpdateString, log.redirect)
HTTP_PHP_INI_ENTRY("http.allowed_methods_log", "", PHP_INI_ALL, OnUpdateString, log.allowed_methods)
HTTP_PHP_INI_ENTRY("http.composite_log", "", PHP_INI_ALL, OnUpdateString, log.composite)
+ HTTP_PHP_INI_ENTRY_EX("http.etag_mode", "-2", PHP_INI_ALL, OnUpdateLong, http_etag_mode_displayer, etag.mode)
#ifdef ZEND_ENGINE_2
HTTP_PHP_INI_ENTRY("http.only_exceptions", "0", PHP_INI_ALL, OnUpdateBool, only_exceptions)
#endif
- HTTP_PHP_INI_ENTRY_EX("http.etag_mode", "-2", PHP_INI_ALL, OnUpdateLong, http_etag_mode_displayer, etag.mode)
+ HTTP_PHP_INI_ENTRY("http.force_exit", "1", PHP_INI_ALL, OnUpdateBool, force_exit)
PHP_INI_END()
/* }}} */
}
#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);
php_info_print_table_colspan_header(2, "Supported ETag Hash Algorithms");
{
- php_info_print_table_row(2, "PHP", "CRC32, MD5, SHA1");
+ php_info_print_table_row(2, "PHP", "CRC32, MD5, SHA1"
+#ifdef HTTP_HAVE_HASH_EXT
+ ", SHA256, SHA384, SHA512, RIPEMD128, RIPEMD160"
+#endif
+ );
#ifdef HTTP_HAVE_MHASH
{
phpstr *algos = phpstr_new();