if ((separator = strchr(Z_STRVAL_PP(entry), ';'))) {
const char *ptr = separator;
- while (*++ptr && !isdigit(*ptr) && '.' != *ptr);
+ while (*++ptr && !HTTP_IS_CTYPE(digit, *ptr) && '.' != *ptr);
quality = atof(ptr);
identifier = estrndup(Z_STRVAL_PP(entry), ident_len = separator - Z_STRVAL_PP(entry));
}
freeme = identifier;
- while (isspace(*identifier)) {
+ while (HTTP_IS_CTYPE(space, *identifier)) {
++identifier;
--ident_len;
}
- while (ident_len && isspace(identifier[ident_len - 1])) {
+ while (ident_len && HTTP_IS_CTYPE(space, identifier[ident_len - 1])) {
identifier[--ident_len] = '\0';
}
range += sizeof("bytes=") - 1;
do {
- switch (c = *(range++))
- {
+ switch (c = *(range++)) {
case '0':
/* allow 000... - shall we? */
if (*ptr != -10) {
*ptr *= 10;
}
- break;
+ break;
case '1': case '2': case '3':
case '4': case '5': case '6':
} else {
*ptr = c - '0';
}
- break;
+ break;
case '-':
ptr = &end;
- break;
+ break;
case ' ':
- /* IE - ignore for now */
- break;
+ break;
case 0:
case ',':
if (length) {
/* validate ranges */
- switch (begin)
- {
+ switch (begin) {
/* "0-12345" */
case -10:
/* "0-" */
return RANGE_ERR;
}
begin = 0;
- break;
+ break;
/* "-12345" */
case -1:
}
begin = length - end;
end = length - 1;
- break;
+ break;
/* "12345-(xxx)" */
default:
- switch (end)
- {
+ switch (end) {
/* "12345-0" */
case -10:
return RANGE_ERR;
- break;
/* "12345-" */
case -1:
return RANGE_ERR;
}
end = length - 1;
- break;
+ break;
/* "12345-67890" */
default:
(end < begin)) {
return RANGE_ERR;
}
- break;
+ break;
}
- break;
+ break;
}
}
{
end = -1;
ptr = &begin;
}
- break;
+ break;
default:
return RANGE_NO;
- break;
}
} while (c != 0);
INIT_ZARR(array, headers);
/* skip leading ws */
- while (isspace(*header)) ++header;
+ while (HTTP_IS_CTYPE(space, *header)) ++header;
line = header;
#define MORE_HEADERS (*(line-1) && !(*(line-1) == '\n' && (*line == '\n' || *line == '\r')))
do {
int value_len = 0;
- switch (*line++)
- {
+ switch (*line++) {
case ':':
if (!colon) {
colon = line - 1;
}
- break;
+ break;
case 0:
--value_len; /* we don't have CR so value length is one char less */
const char *key = header;
/* skip leading ws */
- while (keylen && isspace(*key)) --keylen && ++key;
+ while (keylen && HTTP_IS_CTYPE(space, *key)) --keylen, ++key;
/* skip trailing ws */
- while (keylen && isspace(key[keylen - 1])) --keylen;
+ while (keylen && HTTP_IS_CTYPE(space, key[keylen - 1])) --keylen;
if (keylen > 0) {
zval **previous = NULL;
value_len += line - colon - 1;
/* skip leading ws */
- while (isspace(*(++colon))) --value_len;
+ while (HTTP_IS_CTYPE(space, *(++colon))) --value_len;
/* skip trailing ws */
- while (isspace(colon[value_len - 1])) --value_len;
+ while (HTTP_IS_CTYPE(space, colon[value_len - 1])) --value_len;
if (value_len > 0) {
value = estrndup(colon, value_len);
value_len = 0;
header += line - header;
}
- break;
+ break;
}
} while (MORE_HEADERS);
}
/* }}} */
-/* {{{ void http_get_request_headers_ex(HashTable *, zend_bool) */
-PHP_HTTP_API void _http_get_request_headers_ex(HashTable *headers, zend_bool prettify TSRMLS_DC)
+/* {{{ void http_get_request_headers(HashTable *) */
+PHP_HTTP_API void _http_get_request_headers(HashTable *headers TSRMLS_DC)
{
- char *key = NULL;
- ulong idx = 0;
- uint keylen = 0;
- zval array, **hsv;
+ HashKey key = initHashKey(0);
+ zval **hsv, **header;
HashPosition pos;
-
- Z_ARRVAL(array) = headers;
+
+ if (!HTTP_G->request.headers) {
+ ALLOC_HASHTABLE(HTTP_G->request.headers);
+ zend_hash_init(HTTP_G->request.headers, 0, NULL, ZVAL_PTR_DTOR, 0);
+
#ifdef ZEND_ENGINE_2
- zend_is_auto_global("_SERVER", lenof("_SERVER") TSRMLS_CC);
+ 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;
-
- key += 5;
- keylen -= 6;
- if (prettify) {
- key = pretty_key(estrndup(key, keylen), keylen, 1, 1);
- }
-
- zend_hash_get_current_data_ex(Z_ARRVAL_PP(hsv), (void *) &header, &pos);
-
- orig = *header;
- convert_to_string_ex(header);
- add_assoc_stringl(&array, key, Z_STRVAL_PP(header), Z_STRLEN_PP(header), 1);
- if (orig != *header) {
- zval_ptr_dtor(header);
- }
-
- if (prettify) {
- efree(key);
+
+ if (SUCCESS == zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void *) &hsv) && Z_TYPE_PP(hsv) == IS_ARRAY) {
+ FOREACH_KEY(pos, *hsv, key) {
+ if (key.type == HASH_KEY_IS_STRING && key.len > 6 && !strncmp(key.str, "HTTP_", 5)) {
+ key.len -= 5;
+ key.str = pretty_key(estrndup(key.str + 5, key.len - 1), key.len - 1, 1, 1);
+
+ zend_hash_get_current_data_ex(Z_ARRVAL_PP(hsv), (void *) &header, &pos);
+ ZVAL_ADDREF(*header);
+ zend_hash_add(HTTP_G->request.headers, key.str, key.len, (void *) header, sizeof(zval *), NULL);
+
+ efree(key.str);
}
-
- key = NULL;
- keylen = 0;
}
}
}
+
+ if (headers) {
+ zend_hash_copy(headers, HTTP_G->request.headers, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
+ }
}
/* }}} */
char *name;
uint name_len = strlen(header);
zend_bool result = 0;
- HashTable headers;
- zval **data;
+ zval **data, *zvalue;
+ http_get_request_headers(NULL);
name = pretty_key(estrndup(header, name_len), name_len, 1, 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)) {
- result = (match_case ? strcmp(Z_STRVAL_PP(data), value) : strcasecmp(Z_STRVAL_PP(data), value)) ? 0 : 1;
+ if (SUCCESS == zend_hash_find(HTTP_G->request.headers, name, name_len+1, (void *) &data)) {
+ zvalue = zval_copy(IS_STRING, *data);
+ result = (match_case ? strcmp(Z_STRVAL_P(zvalue), value) : strcasecmp(Z_STRVAL_P(zvalue), value)) ? 0 : 1;
+ zval_free(&zvalue);
}
- zend_hash_destroy(&headers);
efree(name);
return result;
projects / m6w6 / ext-http / blobdiff