- add http_negotiate_content_type()

[m6w6/ext-http] / http_headers_api.c

diff --git a/http_headers_api.c b/http_headers_api.c
index 4c3c5025aa67d27f21665ca8b51953859d3e4589..3cb9c9128626e48c4912c4deb665cd352c19f6b5 100644 (file)
--- a/http_headers_api.c
+++ b/http_headers_api.c
@@ -82,11 +82,11 @@ char *_http_negotiate_language_func(const char *test, double *quality, HashTable
        }
        
        /* no distinct match found, so try primaries */
-       if (dash_test = strchr(test, '-')) {
+       if ((dash_test = strchr(test, '-'))) {
                FOREACH_HASH_VAL(pos, supported, value) {
                        int len = dash_test - test;
 #if HTTP_DBG_NEG
-                       fprintf(stderr, "strncascmp('%s', '%s', %d)\n", Z_STRVAL_PP(value), test, len);
+                       fprintf(stderr, "strncasecmp('%s', '%s', %d)\n", Z_STRVAL_PP(value), test, len);
 #endif
                        if (    (!strncasecmp(Z_STRVAL_PP(value), test, len)) &&
                                        (       (Z_STRVAL_PP(value)[len] == '\0') || 
@@ -153,34 +153,44 @@ PHP_HTTP_API HashTable *_http_negotiate_q(const char *header, HashTable *support
                        array_init(&array);
                        
                        FOREACH_HASH_VAL(pos, Z_ARRVAL(ex_arr), entry) {
+                               int ident_len;
                                double quality;
-                               char *selected, *identifier;
+                               char *selected, *identifier, *freeme;
                                const char *separator;
                                
 #if HTTP_DBG_NEG
                                fprintf(stderr, "Checking %s\n", Z_STRVAL_PP(entry));
 #endif
                                
-                               if (separator = strchr(Z_STRVAL_PP(entry), ';')) {
+                               if ((separator = strchr(Z_STRVAL_PP(entry), ';'))) {
                                        const char *ptr = separator;
                                        
-                                       while (*++ptr && !isdigit(*ptr));
+                                       while (*++ptr && !isdigit(*ptr) && '.' != *ptr);
                                        
                                        quality = atof(ptr);
-                                       identifier = estrndup(Z_STRVAL_PP(entry), separator - Z_STRVAL_PP(entry));
+                                       identifier = estrndup(Z_STRVAL_PP(entry), ident_len = separator - Z_STRVAL_PP(entry));
                                } else {
                                        quality = 1000.0 - i++;
-                                       identifier = estrndup(Z_STRVAL_PP(entry), Z_STRLEN_PP(entry));
+                                       identifier = estrndup(Z_STRVAL_PP(entry), ident_len = Z_STRLEN_PP(entry));
                                }
+                               freeme = identifier;
                                
-                               if (selected = neg(identifier, &quality, supported TSRMLS_CC)) {
+                               while (isspace(*identifier)) {
+                                       ++identifier;
+                                       --ident_len;
+                               }
+                               while (isspace(identifier[ident_len - 1])) {
+                                       identifier[--ident_len] = '\0';
+                               }
+                               
+                               if ((selected = neg(identifier, &quality, supported TSRMLS_CC))) {
                                        /* don't overwrite previously set with higher quality */
                                        if (!zend_hash_exists(Z_ARRVAL(array), selected, strlen(selected) + 1)) {
                                                add_assoc_double(&array, selected, quality);
                                        }
                                }
                                
-                               efree(identifier);
+                               efree(freeme);
                        }
                        
                        result = Z_ARRVAL(array);