| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-2005, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-2006, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
/* $Id$ */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-#include "php.h"
+#include "php_http.h"
-#include "ext/standard/php_string.h"
#include "ext/standard/url.h"
+#include "ext/standard/php_string.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
-/* {{{ */
-PHP_MINIT_FUNCTION(http_headers)
-{
- HTTP_LONG_CONSTANT("HTTP_REDIRECT", HTTP_REDIRECT);
- HTTP_LONG_CONSTANT("HTTP_REDIRECT_PERM", HTTP_REDIRECT_PERM);
- HTTP_LONG_CONSTANT("HTTP_REDIRECT_POST", HTTP_REDIRECT_POST);
- HTTP_LONG_CONSTANT("HTTP_REDIRECT_TEMP", HTTP_REDIRECT_TEMP);
-
- return SUCCESS;
-}
-/* }}} */
-
/* {{{ static int http_sort_q(const void *, const void *) */
static int http_sort_q(const void *a, const void *b TSRMLS_DC)
{
++identifier;
--ident_len;
}
- while (isspace(identifier[ident_len - 1])) {
+ while (ident_len && isspace(identifier[ident_len - 1])) {
identifier[--ident_len] = '\0';
}
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;
INIT_ZARR(array, headers);
- if (body) {
- header_len = body - header;
- } else {
- header_len = strlen(header) + 1;
- }
- line = header;
-
- while (header_len >= (size_t) (line - begin)) {
+ do {
int value_len = 0;
- /* note: valgrind may choke on that -- should be safe though */
+
switch (*line++)
{
case ':':
case 0:
--value_len; /* we don't have CR so value length is one char less */
case '\n':
- if ((!(*line - 1)) || ((*line != ' ') && (*line != '\t'))) {
+ if ((!*(line - 1)) || ((*line != ' ') && (*line != '\t'))) {
http_info i;
/* response/request line */
}
/* 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);
}
efree(key);
}
+ } else {
+ return FAILURE;
}
colon = NULL;
value_len = 0;
}
break;
}
- }
+ } while (*(line-1) && !(*(line-1) == '\n' && (*line == '\n' || *line == '\r')));
+
return SUCCESS;
}
/* }}} */
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;
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);
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);