#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>
+
/* {{{ 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)) {
+ /* should we really issue a notice for a client misbehaviour?
http_error(E_NOTICE, HTTP_E_HEADER, "Range header misses bytes=");
+ */
return RANGE_NO;
}
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;
}
}
/* }}} */
-/* {{{ STATUS http_parse_headers(char *, size_t, HashTable *, zend_bool) */
-PHP_HTTP_API STATUS _http_parse_headers_ex(char *header, size_t header_len,
- HashTable *headers, zend_bool prettify,
- http_parse_headers_callback_t func, void **callback_data TSRMLS_DC)
+/* {{{ STATUS http_parse_headers(char *, HashTable *, zend_bool) */
+PHP_HTTP_API STATUS _http_parse_headers_ex(const char *header, HashTable *headers, zend_bool prettify, http_parse_headers_callback_t func, void **callback_data TSRMLS_DC)
{
- char *colon = NULL, *line = NULL, *begin = header;
+ const char *colon = NULL, *line = NULL, *begin = header, *crlfcrlf = NULL;
+ size_t header_len;
zval array;
Z_ARRVAL(array) = headers;
+ if (crlfcrlf = strstr(header, HTTP_CRLF HTTP_CRLF)) {
+ header_len = crlfcrlf - header + lenof(HTTP_CRLF);
+ } else {
+ header_len = strlen(header) + 1;
+ }
+
+
if (header_len < 2 || !strchr(header, ':')) {
http_error(E_WARNING, HTTP_E_PARSE, "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++)
case '\n':
if ((!(*line - 1)) || ((*line != ' ') && (*line != '\t'))) {
/* response/request line */
- if ( (!strncmp(header, "HTTP/1.", lenof("HTTP/1."))) ||
- (!strncmp(line - lenof("HTTP/1.x\r") + value_len, "HTTP/1.", lenof("HTTP/1.")))) {
+ if ( (!strncmp(header, "HTTP/1.", lenof("HTTP/1."))) ||
+ (!strncmp(line - lenof("HTTP/1.x" HTTP_CRLF) + value_len, "HTTP/1.", lenof("HTTP/1.")))) {
if (func) {
- func(callback_data, header, line - header + value_len, &headers TSRMLS_CC);
+ func(header, &headers, callback_data TSRMLS_CC);
Z_ARRVAL(array) = headers;
}
} else
/* if we already have got such a header make an array of those */
if (SUCCESS == zend_hash_find(headers, key, keylen + 1, (void **) &previous)) {
- /* already an array? - just add */
- if (Z_TYPE_PP(previous) == IS_ARRAY) {
- add_next_index_stringl(*previous, value, value_len, 0);
- } else {
- /* create the array */
- zval *new_array;
- MAKE_STD_ZVAL(new_array);
- array_init(new_array);
-
- add_next_index_stringl(new_array, Z_STRVAL_PP(previous), Z_STRLEN_PP(previous), 1);
- add_next_index_stringl(new_array, value, value_len, 0);
- add_assoc_zval(&array, key, new_array);
+ /* convert to array */
+ if (Z_TYPE_PP(previous) != IS_ARRAY) {
+ convert_to_array(*previous);
}
-
- previous = NULL;
+ add_next_index_stringl(*previous, value, value_len, 0);
} else {
add_assoc_stringl(&array, key, value, value_len, 0);
}
}
/* }}} */
-PHP_HTTP_API void _http_parse_headers_default_callback(void **cb_data, char *http_line, size_t line_length, HashTable **headers TSRMLS_DC)
+PHP_HTTP_API void _http_parse_headers_default_callback(const char *http_line, HashTable **headers, void **cb_data TSRMLS_DC)
{
zval array;
+ char *crlf = NULL;
+ size_t line_length;
Z_ARRVAL(array) = *headers;
+ if (crlf = strstr(http_line, HTTP_CRLF)) {
+ line_length = crlf - http_line;
+ } else {
+ line_length = strlen(http_line);
+ }
+
/* response */
if (!strncmp(http_line, "HTTP/1.", lenof("HTTP/1."))) {
- add_assoc_stringl(&array, "Response Status", http_line + lenof("HTTP/1.x "), line_length - lenof("HTTP/1.x \r\n"), 1);
+ char *status = estrndup(http_line + lenof("HTTP/1.x "), line_length - lenof("HTTP/1.x "));
+ add_assoc_stringl(&array, "Response Status", status, line_length - lenof("HTTP/1.x "), 0);
} else
/* request */
- if (!strncmp(http_line + line_length - lenof("HTTP/1.x\r\n"), "HTTP/1.", lenof("HTTP/1."))) {
+ if (!strncmp(http_line + line_length - lenof("HTTP/1.x"), "HTTP/1.", lenof("HTTP/1."))) {
char *sep = strchr(http_line, ' ');
+ char *url = estrndup(sep + 1, strstr(sep, "HTTP/1.") - sep + 1 + 1);
+ char *met = estrndup(http_line, sep - http_line);
- add_assoc_stringl(&array, "Request Method", http_line, sep - http_line, 1);
- add_assoc_stringl(&array, "Request Uri", sep + 1, strstr(sep, "HTTP/1.") - sep + 1 + 1, 1);
+ add_assoc_stringl(&array, "Request Method", met, sep - http_line, 0);
+ add_assoc_stringl(&array, "Request Uri", url, strstr(sep, "HTTP/1.") - sep + 1 + 1, 0);
}
}
-/* {{{ */
-PHP_HTTP_API STATUS _http_parse_cookie(const char *cookie, HashTable *values TSRMLS_DC)
-{
- const char *key = cookie, *val = NULL;
- int vallen = 0, keylen = 0, done = 0;
- zval array;
-
- Z_ARRVAL(array) = values;
-
- if (!(val = strchr(cookie, '='))) {
- return FAILURE;
- }
-
-#define HTTP_COOKIE_VAL(array, k, str, len) \
- { \
- const char *encoded = str; \
- char *decoded = NULL; \
- int decoded_len = 0, encoded_len = len; \
- decoded = estrndup(encoded, encoded_len); \
- decoded_len = php_url_decode(decoded, encoded_len); \
- add_assoc_stringl(array, k, decoded, decoded_len, 0); \
- }
-#define HTTP_COOKIE_FIXKEY() \
- { \
- while (isspace(*key)) ++key; \
- keylen = val - key; \
- while (isspace(key[keylen - 1])) --keylen; \
- }
-#define HTTP_COOKIE_FIXVAL() \
- { \
- ++val; \
- while (isspace(*val)) ++val; \
- vallen = key - val; \
- while (isspace(val[vallen - 1])) --vallen; \
- }
-
- HTTP_COOKIE_FIXKEY();
- HTTP_COOKIE_VAL(&array, "name", key, keylen);
-
- /* just a name=value cookie */
- if (!(key = strchr(val, ';'))) {
- key = val + strlen(val);
- HTTP_COOKIE_FIXVAL();
- HTTP_COOKIE_VAL(&array, "value", val, vallen);
- }
- /* additional info appended */
- else {
- char *keydup = NULL;
-
- HTTP_COOKIE_FIXVAL();
- HTTP_COOKIE_VAL(&array, "value", val, vallen);
-
- do {
- if (!(val = strchr(key, '='))) {
- break;
- }
- ++key;
- HTTP_COOKIE_FIXKEY();
- keydup = estrndup(key, keylen);
- if (!(key = strchr(val, ';'))) {
- done = 1;
- key = val + strlen(val);
- }
- HTTP_COOKIE_FIXVAL();
- HTTP_COOKIE_VAL(&array, keydup, val, vallen);
- efree(keydup);
- } while (!done);
- }
- return SUCCESS;
-}
-/* }}} */
-
/* {{{ 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)
{
char *key = NULL;
- long idx = 0;
+ ulong idx = 0;
zval array;
Z_ARRVAL(array) = headers;
}
/* }}} */
+/* {{{ zend_bool http_match_request_header(char *, char *) */
+PHP_HTTP_API zend_bool _http_match_request_header_ex(const char *header, const char *value, zend_bool match_case TSRMLS_DC)
+{
+ char *name, *key = NULL;
+ ulong idx;
+ zend_bool result = 0;
+ HashTable headers;
+
+ name = pretty_key(estrdup(header), strlen(header), 1, 1);
+ zend_hash_init(&headers, 0, NULL, ZVAL_PTR_DTOR, 0);
+ http_get_request_headers_ex(&headers, 1);
+
+ FOREACH_HASH_KEY(&headers, key, idx) {
+ if (key && (!strcmp(key, name))) {
+ zval **data;
+
+ if (SUCCESS == zend_hash_get_current_data(&headers, (void **) &data)) {
+ result = (match_case ? strcmp(Z_STRVAL_PP(data), value) : strcasecmp(Z_STRVAL_PP(data), value)) ? 0 : 1;
+ }
+ break;
+ }
+ }
+
+ zend_hash_destroy(&headers);
+ efree(name);
+
+ return result;
+}
+/* }}} */
+
/*
* Local variables:
projects / m6w6 / ext-http / blobdiff