- http_request_defaults() already takes care of resetting curl options so check strin...

[m6w6/ext-http] / http_headers_api.c

diff --git a/http_headers_api.c b/http_headers_api.c
index a45e2823c5bf1cf6a1022d0c6c513412136ceea2..96110d337779e2441f56668f9ab0a9db92463aa7 100644 (file)
--- a/http_headers_api.c
+++ b/http_headers_api.c
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2005, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -24,24 +24,10 @@
 #include "php_http_api.h"
 #include "php_http_headers_api.h"
 
-ZEND_EXTERN_MODULE_GLOBALS(http);
-
 #ifndef HTTP_DBG_NEG
 #      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)
 {
@@ -360,7 +346,6 @@ PHP_HTTP_API STATUS _http_parse_headers_ex(const char *header, HashTable *header
        
        if (header_len) do {
                int value_len = 0;
-               /* note: valgrind may choke on that -- should be safe though */
                switch (*line++)
                {
                        case ':':