- Fixed build on php-trunk

[m6w6/ext-http] / http_headers_api.c

diff --git a/http_headers_api.c b/http_headers_api.c
index 99eb1880ef41133e363b2ba453a86f2f34fead3c..7211304470f48e668441e770ddee46855e26a588 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-2006, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -131,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;
@@ -156,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++;
@@ -201,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=");
@@ -253,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;
@@ -493,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);