projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- create another copy of the header zval
[m6w6/ext-http]
/
http_headers_api.c
diff --git
a/http_headers_api.c
b/http_headers_api.c
index 4c3c5025aa67d27f21665ca8b51953859d3e4589..444c8dea144f35a629fef420628bee0f645da9c3 100644
(file)
--- a/
http_headers_api.c
+++ b/
http_headers_api.c
@@
-15,18
+15,14
@@
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
-#include "php.h"
-#include "ext/standard/php_string.h"
+#include "php_http.h"
+
#include "ext/standard/url.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_api.h"
#include "php_http_headers_api.h"
-#include "php_http_info_api.h"
-
-#include <ctype.h>
ZEND_EXTERN_MODULE_GLOBALS(http);
ZEND_EXTERN_MODULE_GLOBALS(http);
@@
-82,11
+78,11
@@
char *_http_negotiate_language_func(const char *test, double *quality, HashTable
}
/* no distinct match found, so try primaries */
}
/* 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
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, "strncas
e
cmp('%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') ||
#endif
if ( (!strncasecmp(Z_STRVAL_PP(value), test, len)) &&
( (Z_STRVAL_PP(value)[len] == '\0') ||
@@
-153,34
+149,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) {
array_init(&array);
FOREACH_HASH_VAL(pos, Z_ARRVAL(ex_arr), entry) {
+ int ident_len;
double quality;
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
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;
const char *ptr = separator;
- while (*++ptr && !isdigit(*ptr));
+ while (*++ptr && !isdigit(*ptr)
&& '.' != *ptr
);
quality = atof(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++;
} 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 (ident_len && 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);
}
}
/* 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);
}
result = Z_ARRVAL(array);
@@
-351,10
+357,9
@@
PHP_HTTP_API STATUS _http_parse_headers_ex(const char *header, HashTable *header
header_len = strlen(header) + 1;
}
line = header;
header_len = strlen(header) + 1;
}
line = header;
-
-
while (header_len >= (size_t) (line - begin))
{
+
+
if (header_len) do
{
int value_len = 0;
int value_len = 0;
- /* note: valgrind may choke on that -- should be safe though */
switch (*line++)
{
case ':':
switch (*line++)
{
case ':':
@@
-366,7
+371,7
@@
PHP_HTTP_API STATUS _http_parse_headers_ex(const char *header, HashTable *header
case 0:
--value_len; /* we don't have CR so value length is one char less */
case '\n':
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 */
http_info i;
/* response/request line */
@@
-423,7
+428,8
@@
PHP_HTTP_API STATUS _http_parse_headers_ex(const char *header, HashTable *header
}
break;
}
}
break;
}
- }
+ } while (header_len > (size_t) (line - begin));
+
return SUCCESS;
}
/* }}} */
return SUCCESS;
}
/* }}} */