INIT_ZARR(array, *headers);
- switch (info->type)
- {
+ switch (info->type) {
case IS_HTTP_REQUEST:
add_assoc_string(&array, "Request Method", HTTP_INFO(info).request.method, 1);
add_assoc_string(&array, "Request Url", HTTP_INFO(info).request.url, 1);
- break;
+ 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;
+ 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.url, 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;
}