#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
-
-#include <ctype.h>
-
#include "php.h"
+
#include "ext/standard/php_string.h"
#include "ext/standard/url.h"
#include "php_http_api.h"
#include "php_http_headers_api.h"
+#include <ctype.h>
+
+ZEND_EXTERN_MODULE_GLOBALS(http);
+
/* {{{ static int http_sort_q(const void *, const void *) */
static int http_sort_q(const void *a, const void *b TSRMLS_DC)
{
} else {
qual = 1000.0 - i++;
}
+ /* TODO: support primaries only, too */
FOREACH_HASH_VAL((HashTable *)supported, zsupp) {
if (!strcasecmp(Z_STRVAL_PP(zsupp), Z_STRVAL_PP(zentry))) {
add_assoc_double(&zentries, Z_STRVAL_PP(zsupp), qual);
range = Z_STRVAL_P(zrange);
if (strncmp(range, "bytes=", sizeof("bytes=") - 1)) {
- http_error(E_NOTICE, HTTP_E_HEADER, "Range header misses bytes=");
return RANGE_NO;
}
switch (c = *(range++))
{
case '0':
- *ptr *= 10;
+ /* allow 000... - shall we? */
+ if (*ptr != -10) {
+ *ptr *= 10;
+ }
break;
case '1': case '2': case '3':
return RANGE_NO;
}
/* "0-0" or overflow */
- if (end == -10 || length <= end) {
+ if (end == -10 || length <= (size_t) end) {
return RANGE_ERR;
}
begin = 0;
/* "-12345" */
case -1:
/* "-", "-0" or overflow */
- if (end == -1 || end == -10 || length <= end) {
+ if (end == -1 || end == -10 || length <= (size_t) end) {
return RANGE_ERR;
}
begin = length - end;
/* "12345-" */
case -1:
- if (length <= begin) {
+ if (length <= (size_t) begin) {
return RANGE_ERR;
}
end = length - 1;
/* "12345-67890" */
default:
- if ( (length <= begin) ||
- (length <= end) ||
+ if ( (length <= (size_t) begin) ||
+ (length <= (size_t) end) ||
(end < begin)) {
return RANGE_ERR;
}
if (header_len < 2 || !strchr(header, ':')) {
- http_error(E_WARNING, HTTP_E_PARSE, "Cannot parse too short or malformed HTTP headers");
+ http_error(HE_WARNING, HTTP_E_MALFORMED_HEADERS, "Cannot parse too short or malformed HTTP headers");
return FAILURE;
}
line = header;
- while (header_len >= (line - begin)) {
+ while (header_len >= (size_t) (line - begin)) {
int value_len = 0;
switch (*line++)
{
char *key = NULL;
ulong idx = 0;
- zval array;
+ zval array, **hsv;
Z_ARRVAL(array) = headers;
- FOREACH_HASH_KEY(HTTP_SERVER_VARS, key, idx) {
- if (key && !strncmp(key, "HTTP_", 5)) {
- zval **header;
-
- key += 5;
- if (prettify) {
- key = pretty_key(key, strlen(key), 1, 1);
+ if (SUCCESS == zend_hash_find(&EG(symbol_table), "HTTP_SERVER_VARS", sizeof("HTTP_SERVER_VARS"), (void **) &hsv)) {
+ FOREACH_KEY(*hsv, key, idx) {
+ if (key && !strncmp(key, "HTTP_", 5)) {
+ zval **header;
+
+ key += 5;
+ if (prettify) {
+ key = pretty_key(key, strlen(key), 1, 1);
+ }
+
+ zend_hash_get_current_data(Z_ARRVAL_PP(hsv), (void **) &header);
+ add_assoc_stringl(&array, key, Z_STRVAL_PP(header), Z_STRLEN_PP(header), 1);
+ key = NULL;
}
-
- zend_hash_get_current_data(HTTP_SERVER_VARS, (void **) &header);
- add_assoc_stringl(&array, key, Z_STRVAL_PP(header), Z_STRLEN_PP(header), 1);
- key = NULL;
}
}
}