- fix compiler warning

[m6w6/ext-http] / http_headers_api.c

diff --git a/http_headers_api.c b/http_headers_api.c
index ef5099f8681a899421e17c6229a0ed052a2b1cfe..88d4e1c08963897d3cc420fa34b23eac44f55b03 100644 (file)
--- a/http_headers_api.c
+++ b/http_headers_api.c
@@ -12,6 +12,7 @@
 
 /* $Id$ */
 
+#define HTTP_WANT_SAPI
 #include "php_http.h"
 
 #include "ext/standard/url.h"
@@ -24,6 +25,14 @@
 #      define HTTP_DBG_NEG 0
 #endif
 
+/* {{{ static void http_grab_response_headers(void *, void *) */
+static void http_grab_response_headers(void *data, void *arg TSRMLS_DC)
+{
+       phpstr_appendl(PHPSTR(arg), ((sapi_header_struct *)data)->header);
+       phpstr_appends(PHPSTR(arg), HTTP_CRLF);
+}
+/* }}} */
+
 /* {{{ static int http_sort_q(const void *, const void *) */
 static int http_sort_q(const void *a, const void *b TSRMLS_DC)
 {
@@ -107,7 +116,9 @@ PHP_HTTP_API HashTable *_http_negotiate_q(const char *header, HashTable *support
 #if HTTP_DBG_NEG
        fprintf(stderr, "Reading header %s: ", header);
 #endif
-       HTTP_GSC(accept, header, NULL);
+       if (!(accept = http_get_server_var(header, 1))) {
+               return NULL;
+       }
 #if HTTP_DBG_NEG
        fprintf(stderr, "%s\n", Z_STRVAL_P(accept));
 #endif
@@ -189,15 +200,12 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, size_
        char *range, c;
        long begin = -1, end = -1, *ptr;
 
-       HTTP_GSC(zrange, "HTTP_RANGE", RANGE_NO);
-       range = Z_STRVAL_P(zrange);
-
-       if (strncmp(range, "bytes=", sizeof("bytes=") - 1)) {
+       if (    !(zrange = http_get_server_var("HTTP_RANGE", 1)) || 
+                       (size_t) Z_STRLEN_P(zrange) < lenof("bytes=") || strncmp(Z_STRVAL_P(zrange), "bytes=", lenof("bytes="))) {
                return RANGE_NO;
        }
-
+       range = Z_STRVAL_P(zrange) + lenof("bytes=");
        ptr = &begin;
-       range += sizeof("bytes=") - 1;
 
        do {
                switch (c = *(range++)) {
@@ -457,6 +465,23 @@ PHP_HTTP_API void _http_get_request_headers(HashTable *headers TSRMLS_DC)
 }
 /* }}} */
 
+/* {{{ STATUS http_get_response_headers(HashTable *) */
+PHP_HTTP_API STATUS _http_get_response_headers(HashTable *headers_ht TSRMLS_DC)
+{
+       STATUS status;
+       phpstr headers;
+       
+       phpstr_init(&headers);
+       zend_llist_apply_with_argument(&SG(sapi_headers).headers, http_grab_response_headers, &headers TSRMLS_CC);
+       phpstr_fix(&headers);
+       
+       status = http_parse_headers_ex(PHPSTR_VAL(&headers), headers_ht, 1);
+       phpstr_dtor(&headers);
+       
+       return status;
+}
+/* }}} */
+
 /* {{{ zend_bool http_match_request_header(char *, char *) */
 PHP_HTTP_API zend_bool _http_match_request_header_ex(const char *header, const char *value, zend_bool match_case TSRMLS_DC)
 {