X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_headers_api.c;h=c26214592b02420628e66defb06a6c5fec29b03b;hp=12be14fdf53c4932b77749e4afe3f642551808e8;hb=f9a650f4b1ed0baad4a41f6e130991f328dc64b9;hpb=7b88d9022c90eb12e5fe195af8644935141c9d68 diff --git a/http_headers_api.c b/http_headers_api.c index 12be14f..c262145 100644 --- a/http_headers_api.c +++ b/http_headers_api.c @@ -6,16 +6,12 @@ | modification, are permitted provided that the conditions mentioned | | in the accompanying LICENSE file are met. | +--------------------------------------------------------------------+ - | Copyright (c) 2004-2005, Michael Wallner | + | Copyright (c) 2004-2006, Michael Wallner | +--------------------------------------------------------------------+ */ /* $Id$ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include "php_http.h" #include "ext/standard/url.h" @@ -28,18 +24,6 @@ # define HTTP_DBG_NEG 0 #endif -/* {{{ */ -PHP_MINIT_FUNCTION(http_headers) -{ - HTTP_LONG_CONSTANT("HTTP_REDIRECT", HTTP_REDIRECT); - HTTP_LONG_CONSTANT("HTTP_REDIRECT_PERM", HTTP_REDIRECT_PERM); - HTTP_LONG_CONSTANT("HTTP_REDIRECT_POST", HTTP_REDIRECT_POST); - HTTP_LONG_CONSTANT("HTTP_REDIRECT_TEMP", HTTP_REDIRECT_TEMP); - - return SUCCESS; -} -/* }}} */ - /* {{{ static int http_sort_q(const void *, const void *) */ static int http_sort_q(const void *a, const void *b TSRMLS_DC) { @@ -442,7 +426,9 @@ PHP_HTTP_API void _http_get_request_headers_ex(HashTable *headers, zend_bool pre HashPosition pos; Z_ARRVAL(array) = headers; - +#ifdef ZEND_ENGINE_2 + zend_is_auto_global("_SERVER", lenof("_SERVER") TSRMLS_CC); +#endif if (SUCCESS == zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void **) &hsv)) { FOREACH_KEYLEN(pos, *hsv, key, keylen, idx) { if (key && keylen > 6 && !strncmp(key, "HTTP_", 5)) {