X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_headers_api.c;h=7211304470f48e668441e770ddee46855e26a588;hp=95fbdec82c17fa5efa6fd7e0ca7a95aec85c00f5;hb=ad5f896b03adaa073134a00108a9cdf00720673a;hpb=b3afcfc70bf06c062115f4994cc04fc8c6e4aa67

diff --git a/http_headers_api.c b/http_headers_api.c
index 95fbdec..7211304 100644
--- a/http_headers_api.c
+++ b/http_headers_api.c
@@ -6,12 +6,13 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
 /* $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)
 {
@@ -122,7 +131,7 @@ PHP_HTTP_API HashTable *_http_negotiate_q(const char *header, HashTable *support
 		ZVAL_STRINGL(&ex_del, ",", 1, 0);
 		array_init(&ex_arr);
 		
-		php_explode(&ex_del, accept, &ex_arr, -1);
+		php_explode(&ex_del, accept, &ex_arr, INT_MAX);
 		
 		if (zend_hash_num_elements(Z_ARRVAL(ex_arr)) > 0) {
 			int i = 0;
@@ -147,7 +156,7 @@ PHP_HTTP_API HashTable *_http_negotiate_q(const char *header, HashTable *support
 					
 					while (*++ptr && !HTTP_IS_CTYPE(digit, *ptr) && '.' != *ptr);
 					
-					quality = atof(ptr);
+					quality = zend_strtod(ptr, NULL);
 					identifier = estrndup(Z_STRVAL_PP(entry), ident_len = separator - Z_STRVAL_PP(entry));
 				} else {
 					quality = 1000.0 - i++;
@@ -192,7 +201,7 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, size_
 	long begin = -1, end = -1, *ptr;
 
 	if (	!(zrange = http_get_server_var("HTTP_RANGE", 1)) || 
-			Z_STRLEN_P(zrange) < lenof("bytes=") || strncmp(Z_STRVAL_P(zrange), "bytes=", lenof("bytes="))) {
+			(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=");
@@ -244,13 +253,21 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, size_
 					switch (begin) {
 						/* "0-12345" */
 						case -10:
-							/* "0-" */
-							if (end == -1) {
-								return RANGE_NO;
-							}
-							/* "0-0" or overflow */
-							if (end == -10 || length <= (size_t) end) {
-								return RANGE_ERR;
+							switch (end) {
+								/* "0-" */
+								case -1:
+									return RANGE_NO;
+									
+								/* "0-0" */
+								case -10:
+									end = 0;
+									break;
+									
+								default:
+									if (length <= (size_t) end) {
+										return RANGE_ERR;
+									}
+									break;
 							}
 							begin = 0;
 							break;
@@ -456,6 +473,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)
 {
@@ -467,9 +501,9 @@ PHP_HTTP_API zend_bool _http_match_request_header_ex(const char *header, const c
 	http_get_request_headers(NULL);
 	name = pretty_key(estrndup(header, name_len), name_len, 1, 1);
 	if (SUCCESS == zend_hash_find(HTTP_G->request.headers, name, name_len+1, (void *) &data)) {
-		zvalue = zval_copy(IS_STRING, *data);
+		zvalue = http_zsep(IS_STRING, *data);
 		result = (match_case ? strcmp(Z_STRVAL_P(zvalue), value) : strcasecmp(Z_STRVAL_P(zvalue), value)) ? 0 : 1;
-		zval_free(&zvalue);
+		zval_ptr_dtor(&zvalue);
 	}
 	efree(name);