| 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> |
+--------------------------------------------------------------------+
*/
/* $Id$ */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-#include "php.h"
+#include "php_http.h"
-#include "ext/standard/php_string.h"
#include "ext/standard/url.h"
+#include "ext/standard/php_string.h"
-#include "php_http.h"
-#include "php_http_std_defs.h"
#include "php_http_api.h"
#include "php_http_headers_api.h"
-#include "php_http_info_api.h"
-
-#include <ctype.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)
{
}
/* 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') ||
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;
+
+ while (isspace(*identifier)) {
+ ++identifier;
+ --ident_len;
+ }
+ while (ident_len && isspace(identifier[ident_len - 1])) {
+ identifier[--ident_len] = '\0';
}
- if (selected = neg(identifier, &quality, supported TSRMLS_CC)) {
+ 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);
header_len = strlen(header) + 1;
}
line = header;
-
- while (header_len >= (size_t) (line - begin)) {
+
+ if (header_len) do {
int value_len = 0;
- /* note: valgrind may choke on that -- should be safe though */
switch (*line++)
{
case ':':
case 0:
--value_len; /* we don't have CR so value length is one char less */
case '\n':
- if ((!(*line - 1)) || ((*line != ' ') && (*line != '\t'))) {
+ if ((!*(line - 1)) || ((*line != ' ') && (*line != '\t'))) {
http_info i;
/* response/request line */
}
break;
}
- }
+ } while (header_len > (size_t) (line - begin));
+
return SUCCESS;
}
/* }}} */