/*
- +----------------------------------------------------------------------+
- | 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-2005, 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;
+
+ INIT_ZARR(array, *headers);
switch (info->type)
{
}
/* where's the end of the line */
- if (!((end = strchr(pre_header, '\r')) || (end = strchr(pre_header, '\n')))) {
+ if (!(end = http_locate_eol(pre_header, NULL))) {
end = pre_header + strlen(pre_header);
}
}
/* 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;
return SUCCESS;
}
+
+ /* some darn header containing HTTP/1.x */
+ else {
+ return FAILURE;
+ }
}