/*
- +----------------------------------------------------------------------+
- | PECL :: http |
- +----------------------------------------------------------------------+
- | This source file is subject to version 3.0 of the PHP license, that |
- | is bundled with this package in the file LICENSE, and is available |
- | through the world-wide-web at http://www.php.net/license/3_0.txt. |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
- +----------------------------------------------------------------------+
- | Copyright (c) 2004-2005 Michael Wallner <mike@php.net> |
- +----------------------------------------------------------------------+
+ +--------------------------------------------------------------------+
+ | PECL :: http |
+ +--------------------------------------------------------------------+
+ | Redistribution and use in source and binary forms, with or without |
+ | modification, are permitted provided that the conditions mentioned |
+ | in the accompanying LICENSE file are met. |
+ +--------------------------------------------------------------------+
+ | Copyright (c) 2004-2010, Michael Wallner <mike@php.net> |
+ +--------------------------------------------------------------------+
*/
/* $Id$ */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-#include "php.h"
-
#include "php_http.h"
+
#include "php_http_api.h"
-#include "php_http_std_defs.h"
#include "php_http_info_api.h"
-#include <ctype.h>
-
-ZEND_EXTERN_MODULE_GLOBALS(http);
-
PHP_HTTP_API void _http_info_default_callback(void **nothing, HashTable **headers, http_info *info TSRMLS_DC)
{
zval array;
- Z_ARRVAL(array) = *headers;
- switch (info->type)
- {
+ INIT_ZARR(array, *headers);
+
+ switch (info->type) {
case IS_HTTP_REQUEST:
add_assoc_string(&array, "Request Method", HTTP_INFO(info).request.method, 1);
- add_assoc_string(&array, "Request Uri", HTTP_INFO(info).request.URI, 1);
- break;
+ add_assoc_string(&array, "Request Url", HTTP_INFO(info).request.url, 1);
+ break;
case IS_HTTP_RESPONSE:
add_assoc_long(&array, "Response Code", (long) HTTP_INFO(info).response.code);
- add_assoc_string(&array, "Response Status", HTTP_INFO(info).response.status, 1);
- break;
+ if (HTTP_INFO(info).response.status) {
+ add_assoc_string(&array, "Response Status", HTTP_INFO(info).response.status, 1);
+ }
+ break;
}
}
-PHP_HTTP_API void _http_info_dtor(http_info *info)
+PHP_HTTP_API void _http_info_dtor(http_info *i)
{
- http_info_t *i = (http_info_t *) info;
-
- switch (info->type)
- {
+ switch (i->type) {
case IS_HTTP_REQUEST:
- STR_SET(i->request.method, NULL);
- STR_SET(i->request.URI, NULL);
- break;
+ STR_SET(HTTP_INFO(i).request.method, NULL);
+ STR_SET(HTTP_INFO(i).request.url, NULL);
+ break;
case IS_HTTP_RESPONSE:
- STR_SET(i->response.status, NULL);
- break;
+ STR_SET(HTTP_INFO(i).response.status, NULL);
+ break;
default:
- break;
+ break;
}
}
/* sane parameter */
if ((!pre_header) || (!*pre_header)) {
- if (!silent) {
- http_error(HE_WARNING, HTTP_E_MALFORMED_HEADERS, "Empty pre-header HTTP info");
- }
return FAILURE;
}
end = pre_header + strlen(pre_header);
}
- /* there must be HTTP/1.x in the line
- * and nothing than SPACE or NUL after HTTP/1.x
- */
- if ( (!(http = strstr(pre_header, "HTTP/1."))) ||
- (!(http < end)) ||
- (!isdigit(http[lenof("HTTP/1.")])) ||
- (http[lenof("HTTP/1.1")] && (!isspace(http[lenof("HTTP/1.1")])))) {
+ /* there must be HTTP/1.x in the line */
+ if (!(http = http_locate_str(pre_header, end - pre_header, "HTTP/1.", lenof("HTTP/1.")))) {
+ return FAILURE;
+ }
+
+ /* and nothing than SPACE or NUL after HTTP/1.x */
+ if ( (!HTTP_IS_CTYPE(digit, http[lenof("HTTP/1.")])) ||
+ (http[lenof("HTTP/1.1")] && (!HTTP_IS_CTYPE(space, http[lenof("HTTP/1.1")])))) {
if (!silent) {
- http_error(HE_WARNING, HTTP_E_MALFORMED_HEADERS, "Invalid or missing HTTP/1.x protocol identification");
+ http_error(HE_WARNING, HTTP_E_MALFORMED_HEADERS, "Invalid HTTP/1.x protocol identification");
}
return FAILURE;
}
}
#endif
- info->http.version = atof(http + lenof("HTTP/"));
+ info->http.version = zend_strtod(http + lenof("HTTP/"), NULL);
/* is response */
if (pre_header == http) {
const char *code = http + sizeof("HTTP/1.1");
info->type = IS_HTTP_RESPONSE;
- HTTP_INFO(info).response.code = (code && (end > code)) ? strtol(code, &status, 10) : 0;
- HTTP_INFO(info).response.status = (status && (end > ++status)) ? estrndup(status, end - status) : ecalloc(1,1);
+ while (' ' == *code) ++code;
+ if (code && end > code) {
+ HTTP_INFO(info).response.code = strtol(code, &status, 10);
+ } else {
+ HTTP_INFO(info).response.code = 0;
+ }
+ if (status && end > status) {
+ while (' ' == *status) ++status;
+ HTTP_INFO(info).response.status = estrndup(status, end - status);
+ } else {
+ HTTP_INFO(info).response.status = NULL;
+ }
return SUCCESS;
}
/* is request */
- else {
+ else if (!http[lenof("HTTP/1.x")] || http[lenof("HTTP/1.x")] == '\r' || http[lenof("HTTP/1.x")] == '\n') {
const char *url = strchr(pre_header, ' ');
info->type = IS_HTTP_REQUEST;
if (url && http > url) {
HTTP_INFO(info).request.method = estrndup(pre_header, url - pre_header);
- HTTP_INFO(info).request.URI = estrndup(url + 1, http - url - 2);
+ while (' ' == *url) ++url;
+ while (' ' == *(http-1)) --http;
+ if (http > url) {
+ HTTP_INFO(info).request.url = estrndup(url, http - url);
+ } else {
+ efree(HTTP_INFO(info).request.method);
+ return FAILURE;
+ }
} else {
- HTTP_INFO(info).request.method = ecalloc(1,1);
- HTTP_INFO(info).request.URI = ecalloc(1,1);
+ HTTP_INFO(info).request.method = NULL;
+ HTTP_INFO(info).request.url = NULL;
}
return SUCCESS;
}
-}
+ /* some darn header containing HTTP/1.x */
+ else {
+ return FAILURE;
+ }
+}
/*
* Local variables:
projects / m6w6 / ext-http / blobdiff