| 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 "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;
{
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);
+ add_assoc_string(&array, "Request Url", HTTP_INFO(info).request.url, 1);
break;
case IS_HTTP_RESPONSE:
}
}
-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);
+ 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);
+ STR_SET(HTTP_INFO(i).response.status, NULL);
break;
default:
}
/* 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);
+ HTTP_INFO(info).request.url = estrndup(url + 1, http - url - 2);
} else {
HTTP_INFO(info).request.method = ecalloc(1,1);
- HTTP_INFO(info).request.URI = ecalloc(1,1);
+ HTTP_INFO(info).request.url = ecalloc(1,1);
}
return SUCCESS;
}
+
+ /* some darn header containing HTTP/1.x */
+ else {
+ return FAILURE;
+ }
}