projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- fix errenous bailout of http_parse_headers() introduced with last commit
[m6w6/ext-http]
/
http_headers_api.c
diff --git
a/http_headers_api.c
b/http_headers_api.c
index 96110d337779e2441f56668f9ab0a9db92463aa7..a5448a995c1a79eb86c442795e9040db8d8a17e0 100644
(file)
--- a/
http_headers_api.c
+++ b/
http_headers_api.c
@@
-12,10
+12,6
@@
/* $Id$ */
/* $Id$ */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "php_http.h"
#include "ext/standard/url.h"
#include "php_http.h"
#include "ext/standard/url.h"
@@
-330,22
+326,15
@@
PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, size_
PHP_HTTP_API STATUS _http_parse_headers_ex(const char *header, HashTable *headers, zend_bool prettify,
http_info_callback callback_func, void **callback_data TSRMLS_DC)
{
PHP_HTTP_API STATUS _http_parse_headers_ex(const char *header, HashTable *headers, zend_bool prettify,
http_info_callback callback_func, void **callback_data TSRMLS_DC)
{
- const char *colon = NULL, *line = NULL, *begin = header;
- const char *body = http_locate_body(header);
- size_t header_len;
+ const char *colon = NULL, *line = header;
zval array;
zval array;
-
- INIT_ZARR(array, headers);
- if (body) {
- header_len = body - header;
- } else {
- header_len = strlen(header) + 1;
- }
- line = header;
+ INIT_ZARR(array, headers);
- if (header_len) do {
+#define MORE_HEADERS (*(line-1) && !(*(line-1) == '\n' && (*line == '\n' || *line == '\r')))
+ do {
int value_len = 0;
int value_len = 0;
+
switch (*line++)
{
case ':':
switch (*line++)
{
case ':':
@@
-365,11
+354,8
@@
PHP_HTTP_API STATUS _http_parse_headers_ex(const char *header, HashTable *header
callback_func(callback_data, &headers, &i TSRMLS_CC);
http_info_dtor(&i);
Z_ARRVAL(array) = headers;
callback_func(callback_data, &headers, &i TSRMLS_CC);
http_info_dtor(&i);
Z_ARRVAL(array) = headers;
- } else
-
- /* "header: value" pair */
- if (colon) {
-
+ } else if (colon) {
+ /* "header: value" pair */
/* skip empty key */
if (header != colon) {
zval **previous = NULL;
/* skip empty key */
if (header != colon) {
zval **previous = NULL;
@@
-396,7
+382,7
@@
PHP_HTTP_API STATUS _http_parse_headers_ex(const char *header, HashTable *header
}
/* if we already have got such a header make an array of those */
}
/* if we already have got such a header make an array of those */
- if (SUCCESS == zend_hash_find(headers, key, keylen + 1, (void *
*
) &previous)) {
+ if (SUCCESS == zend_hash_find(headers, key, keylen + 1, (void *) &previous)) {
/* convert to array */
if (Z_TYPE_PP(previous) != IS_ARRAY) {
convert_to_array(*previous);
/* convert to array */
if (Z_TYPE_PP(previous) != IS_ARRAY) {
convert_to_array(*previous);
@@
-407,6
+393,8
@@
PHP_HTTP_API STATUS _http_parse_headers_ex(const char *header, HashTable *header
}
efree(key);
}
}
efree(key);
}
+ } else if (MORE_HEADERS) {
+ return FAILURE;
}
colon = NULL;
value_len = 0;
}
colon = NULL;
value_len = 0;
@@
-414,7
+402,7
@@
PHP_HTTP_API STATUS _http_parse_headers_ex(const char *header, HashTable *header
}
break;
}
}
break;
}
- } while (
header_len > (size_t) (line - begin)
);
+ } while (
MORE_HEADERS
);
return SUCCESS;
}
return SUCCESS;
}
@@
-430,8
+418,10
@@
PHP_HTTP_API void _http_get_request_headers_ex(HashTable *headers, zend_bool pre
HashPosition pos;
Z_ARRVAL(array) = headers;
HashPosition pos;
Z_ARRVAL(array) = headers;
-
- if (SUCCESS == zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void **) &hsv)) {
+#ifdef ZEND_ENGINE_2
+ zend_is_auto_global("_SERVER", lenof("_SERVER") TSRMLS_CC);
+#endif
+ if (SUCCESS == zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void *) &hsv)) {
FOREACH_KEYLEN(pos, *hsv, key, keylen, idx) {
if (key && keylen > 6 && !strncmp(key, "HTTP_", 5)) {
zval **header, *orig;
FOREACH_KEYLEN(pos, *hsv, key, keylen, idx) {
if (key && keylen > 6 && !strncmp(key, "HTTP_", 5)) {
zval **header, *orig;
@@
-442,7
+432,7
@@
PHP_HTTP_API void _http_get_request_headers_ex(HashTable *headers, zend_bool pre
key = pretty_key(estrndup(key, keylen), keylen, 1, 1);
}
key = pretty_key(estrndup(key, keylen), keylen, 1, 1);
}
- zend_hash_get_current_data_ex(Z_ARRVAL_PP(hsv), (void *
*
) &header, &pos);
+ zend_hash_get_current_data_ex(Z_ARRVAL_PP(hsv), (void *) &header, &pos);
orig = *header;
convert_to_string_ex(header);
orig = *header;
convert_to_string_ex(header);
@@
-476,7
+466,7
@@
PHP_HTTP_API zend_bool _http_match_request_header_ex(const char *header, const c
zend_hash_init(&headers, 0, NULL, ZVAL_PTR_DTOR, 0);
http_get_request_headers_ex(&headers, 1);
zend_hash_init(&headers, 0, NULL, ZVAL_PTR_DTOR, 0);
http_get_request_headers_ex(&headers, 1);
- if (SUCCESS == zend_hash_find(&headers, name, name_len+1, (void *
*
) &data)) {
+ if (SUCCESS == zend_hash_find(&headers, name, name_len+1, (void *) &data)) {
result = (match_case ? strcmp(Z_STRVAL_PP(data), value) : strcasecmp(Z_STRVAL_PP(data), value)) ? 0 : 1;
}
zend_hash_destroy(&headers);
result = (match_case ? strcmp(Z_STRVAL_PP(data), value) : strcasecmp(Z_STRVAL_PP(data), value)) ? 0 : 1;
}
zend_hash_destroy(&headers);