#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.h"
#include "php_http_std_defs.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);
+
+#ifndef HTTP_DBG_NEG
+# define HTTP_DBG_NEG 0
+#endif
/* {{{ static int http_sort_q(const void *, const void *) */
static int http_sort_q(const void *a, const void *b TSRMLS_DC)
}
/* }}} */
-/* {{{ char *http_negotiate_q(char *, HashTable *, char *) */
-PHP_HTTP_API char *_http_negotiate_q(const char *entry, const HashTable *supported, const char *def TSRMLS_DC)
+/* {{{ char *http_negotiate_language_func */
+char *_http_negotiate_language_func(const char *test, double *quality, HashTable *supported TSRMLS_DC)
{
- zval *zaccept, zdelim, zarray, zentries, **zentry, **zsupp;
- char *q_ptr = NULL, *key = NULL;
- int i = 0;
- ulong idx = 0;
- double qual;
-
- HTTP_GSC(zaccept, entry, estrdup(def));
-
- array_init(&zarray);
- array_init(&zentries);
-
- Z_STRVAL(zdelim) = ",";
- Z_STRLEN(zdelim) = 1;
-
- php_explode(&zdelim, zaccept, &zarray, -1);
-
- FOREACH_HASH_VAL(Z_ARRVAL(zarray), zentry) {
- if (q_ptr = strrchr(Z_STRVAL_PP(zentry), ';')) {
- qual = strtod(q_ptr + 3, NULL);
- *q_ptr = 0;
- q_ptr = NULL;
- } else {
- qual = 1000.0 - i++;
+ zval **value;
+ const char *dash_test;
+
+ FOREACH_HASH_VAL(supported, value) {
+#if HTTP_DBG_NEG
+ fprintf(stderr, "strcasecmp('%s', '%s')\n", Z_STRVAL_PP(value), test);
+#endif
+ if (!strcasecmp(Z_STRVAL_PP(value), test)) {
+ return Z_STRVAL_PP(value);
}
- 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);
- break;
+ }
+
+ /* no distinct match found, so try primaries */
+ if (dash_test = strchr(test, '-')) {
+ FOREACH_HASH_VAL(supported, value) {
+ int len = dash_test - test;
+#if HTTP_DBG_NEG
+ fprintf(stderr, "strncascmp('%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') ||
+ (Z_STRVAL_PP(value)[len] == '-'))) {
+ *quality /= 2;
+ return Z_STRVAL_PP(value);
}
}
}
- zval_dtor(&zarray);
-
- zend_hash_sort(Z_ARRVAL(zentries), zend_qsort, http_sort_q, 0 TSRMLS_CC);
+
+ return NULL;
+}
+/* }}} */
- FOREACH_HASH_KEY(Z_ARRVAL(zentries), key, idx) {
- if (key) {
- key = estrdup(key);
- zval_dtor(&zentries);
- return key;
+/* {{{ char *http_negotiate_charset_func */
+char *_http_negotiate_charset_func(const char *test, double *quality, HashTable *supported TSRMLS_DC)
+{
+ zval **value;
+
+ FOREACH_HASH_VAL(supported, value) {
+#if HTTP_DBG_NEG
+ fprintf(stderr, "strcasecmp('%s', '%s')\n", Z_STRVAL_PP(value), test);
+#endif
+ if (!strcasecmp(Z_STRVAL_PP(value), test)) {
+ return Z_STRVAL_PP(value);
}
}
- zval_dtor(&zentries);
+
+ return NULL;
+}
+/* }}} */
- return estrdup(def);
+/* {{{ HashTable *http_negotiate_q(const char *, HashTable *, negotiate_func_t) */
+PHP_HTTP_API HashTable *_http_negotiate_q(const char *header, HashTable *supported, negotiate_func_t neg TSRMLS_DC)
+{
+ zval *accept;
+ HashTable *result = NULL;
+
+#if HTTP_DBG_NEG
+ fprintf(stderr, "Reading header %s: ", header);
+#endif
+ HTTP_GSC(accept, header, NULL);
+#if HTTP_DBG_NEG
+ fprintf(stderr, "%s\n", Z_STRVAL_P(accept));
+#endif
+
+ if (Z_STRLEN_P(accept)) {
+ zval ex_arr, ex_del;
+
+ INIT_PZVAL(&ex_del);
+ INIT_PZVAL(&ex_arr);
+ ZVAL_STRINGL(&ex_del, ",", 1, 0);
+ array_init(&ex_arr);
+
+ php_explode(&ex_del, accept, &ex_arr, -1);
+
+ if (zend_hash_num_elements(Z_ARRVAL(ex_arr)) > 0) {
+ int i = 0;
+ zval **entry, array;
+
+ INIT_PZVAL(&array);
+ array_init(&array);
+
+ FOREACH_HASH_VAL(Z_ARRVAL(ex_arr), entry) {
+ double quality;
+ char *selected, *identifier;
+ const char *separator;
+
+#if HTTP_DBG_NEG
+ fprintf(stderr, "Checking %s\n", Z_STRVAL_PP(entry));
+#endif
+
+ if (separator = strchr(Z_STRVAL_PP(entry), ';')) {
+ const char *ptr = separator;
+
+ while (*++ptr && !isdigit(*ptr));
+
+ quality = strtod(ptr, NULL);
+ identifier = estrndup(Z_STRVAL_PP(entry), separator - Z_STRVAL_PP(entry));
+ } else {
+ quality = 1000.0 - i++;
+ identifier = estrndup(Z_STRVAL_PP(entry), Z_STRLEN_PP(entry));
+ }
+
+ 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);
+ }
+ }
+
+ efree(identifier);
+ }
+
+ result = Z_ARRVAL(array);
+ zend_hash_sort(result, zend_qsort, http_sort_q, 0 TSRMLS_CC);
+ }
+
+ zval_dtor(&ex_arr);
+ }
+
+ return result;
}
/* }}} */
range = Z_STRVAL_P(zrange);
if (strncmp(range, "bytes=", sizeof("bytes=") - 1)) {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "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;
}
}
/* }}} */
-/* {{{ STATUS http_parse_headers(char *, size_t, HashTable *, zend_bool) */
-PHP_HTTP_API STATUS _http_parse_headers_ex(const char *header, size_t header_len,
- HashTable *headers, zend_bool prettify 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_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;
zval array;
- Z_ARRVAL(array) = headers;
-
- if (header_len < 2) {
- return FAILURE;
- }
-
- /* status code */
- if (!strncmp(header, "HTTP/1.", 7)) {
- char *end = strstr(header, HTTP_CRLF);
- size_t len = end - (header + lenof("HTTP/1.x "));
- char *val = estrndup(header + lenof("HTTP/1.x "), len);
-
- add_assoc_stringl(&array, "Status", val, len, 0);
- header = end + 2;
+ INIT_ZARR(array, headers);
+
+ if (body) {
+ header_len = body - header;
+ } else {
+ header_len = strlen(header) + 1;
}
-
line = header;
- while (header_len >= (line - begin)) {
+ while (header_len >= (size_t) (line - begin)) {
int value_len = 0;
-
+ /* note: valgrind may choke on that -- should be safe though */
switch (*line++)
{
+ case ':':
+ if (!colon) {
+ colon = line - 1;
+ }
+ break;
+
case 0:
--value_len; /* we don't have CR so value length is one char less */
case '\n':
- if (colon && ((!(*line - 1)) || ((*line != ' ') && (*line != '\t')))) {
-
- /* skip empty key */
- if (header != colon) {
- zval **previous = NULL;
- char *value = empty_string;
- int keylen = colon - header;
- char *key = estrndup(header, keylen);
-
- if (prettify) {
- key = pretty_key(key, keylen, 1, 1);
- }
-
- value_len += line - colon - 1;
+ if ((!(*line - 1)) || ((*line != ' ') && (*line != '\t'))) {
+ http_info i;
+
+ /* response/request line */
+ if (SUCCESS == http_info_parse(header, &i)) {
+ callback_func(callback_data, &headers, &i TSRMLS_CC);
+ http_info_dtor(&i);
+ Z_ARRVAL(array) = headers;
+ } else
+
+ /* "header: value" pair */
+ if (colon) {
+
+ /* skip empty key */
+ if (header != colon) {
+ zval **previous = NULL;
+ char *value;
+ int keylen = colon - header;
+ char *key = estrndup(header, keylen);
+
+ if (prettify) {
+ key = pretty_key(key, keylen, 1, 1);
+ }
- /* skip leading ws */
- while (isspace(*(++colon))) --value_len;
- /* skip trailing ws */
- while (isspace(colon[value_len - 1])) --value_len;
+ value_len += line - colon - 1;
- if (value_len > 0) {
- value = estrndup(colon, value_len);
- } else {
- value_len = 0;
- }
+ /* skip leading ws */
+ while (isspace(*(++colon))) --value_len;
+ /* skip trailing ws */
+ while (isspace(colon[value_len - 1])) --value_len;
- /* 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);
+ if (value_len > 0) {
+ value = estrndup(colon, value_len);
} 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);
+ value = estrdup("");
+ value_len = 0;
}
- previous = NULL;
- } else {
- add_assoc_stringl(&array, key, value, value_len, 0);
+ /* if we already have got such a header make an array of those */
+ 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);
+ }
+ add_next_index_stringl(*previous, value, value_len, 0);
+ } else {
+ add_assoc_stringl(&array, key, value, value_len, 0);
+ }
+ efree(key);
}
- efree(key);
}
-
colon = NULL;
value_len = 0;
header += line - header;
}
break;
-
- case ':':
- if (!colon) {
- colon = line - 1;
- }
- break;
}
}
return SUCCESS;
}
/* }}} */
-/* {{{ */
-PHP_HTTP_API STATUS _http_parse_cookie(const char *cookie, HashTable *values TSRMLS_DC)
+/* {{{ 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)
{
- 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;
+ char *key = NULL;
+ ulong idx = 0;
+ zval array, **hsv;
- HTTP_COOKIE_FIXVAL();
- HTTP_COOKIE_VAL(&array, "value", val, vallen);
+ Z_ARRVAL(array) = headers;
- do {
- if (!(val = strchr(key, '='))) {
- break;
- }
- ++key;
- HTTP_COOKIE_FIXKEY();
- keydup = estrndup(key, keylen);
- if (!(key = strchr(val, ';'))) {
- done = 1;
- key = val + strlen(val);
+ if (SUCCESS == zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (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;
}
- 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)
+/* {{{ 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 *key = NULL;
- long idx = 0;
- zval array;
+ char *name, *key = NULL;
+ ulong idx;
+ zend_bool result = 0;
+ HashTable headers;
- Z_ARRVAL(array) = 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(HTTP_SERVER_VARS, key, idx) {
- if (key && !strncmp(key, "HTTP_", 5)) {
- zval **header;
+ FOREACH_HASH_KEY(&headers, key, idx) {
+ if (key && (!strcmp(key, name))) {
+ zval **data;
- key += 5;
- if (prettify) {
- key = pretty_key(key, strlen(key), 1, 1);
+ 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;
}
-
- 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;
+ break;
}
}
+
+ zend_hash_destroy(&headers);
+ efree(name);
+
+ return result;
}
/* }}} */
projects / m6w6 / ext-http / blobdiff