| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-2006, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-2007, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
}
#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;
}
info->type = IS_HTTP_REQUEST;
if (url && http > url) {
HTTP_INFO(info).request.method = estrndup(pre_header, url - pre_header);
- HTTP_INFO(info).request.url = 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.url = ecalloc(1,1);
+ HTTP_INFO(info).request.method = NULL;
+ HTTP_INFO(info).request.url = NULL;
}
return SUCCESS;
}
}
-
/*
* Local variables:
* tab-width: 4