#include "php_http_api.h"
-php_http_info_t *php_http_info_init(php_http_info_t *i TSRMLS_DC)
+php_http_info_t *php_http_info_init(php_http_info_t *i)
{
if (!i) {
i = emalloc(sizeof(*i));
{
switch (i->type) {
case PHP_HTTP_REQUEST:
- STR_SET(PHP_HTTP_INFO(i).request.method, NULL);
- STR_SET(PHP_HTTP_INFO(i).request.url, NULL);
+ PTR_SET(PHP_HTTP_INFO(i).request.method, NULL);
+ PTR_SET(PHP_HTTP_INFO(i).request.url, NULL);
break;
case PHP_HTTP_RESPONSE:
- STR_SET(PHP_HTTP_INFO(i).response.status, NULL);
+ PTR_SET(PHP_HTTP_INFO(i).response.status, NULL);
break;
default:
}
}
-php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_header TSRMLS_DC)
+php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_header)
{
const char *end, *http;
zend_bool free_info = !info;
info = php_http_info_init(info TSRMLS_CC);
/* and nothing than SPACE or NUL after HTTP/1.x */
- if (!php_http_version_parse(&info->http.version, http TSRMLS_CC)
+ if (!php_http_version_parse(&info->http.version, http)
|| (http[lenof("HTTP/1.1")] && (!PHP_HTTP_IS_CTYPE(space, http[lenof("HTTP/1.1")])))) {
if (free_info) {
php_http_info_free(&info);
while (' ' == *url) ++url;
while (' ' == *(http-1)) --http;
if (http > url) {
- PHP_HTTP_INFO(info).request.url = estrndup(url, http - url);
+ PHP_HTTP_INFO(info).request.url = php_http_url_parse(url, http - url, ~0);
} else {
- STR_SET(PHP_HTTP_INFO(info).request.method, NULL);
+ PTR_SET(PHP_HTTP_INFO(info).request.method, NULL);
return NULL;
}
} else {