projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
update response headers
[m6w6/ext-http]
/
php_http_info.c
diff --git
a/php_http_info.c
b/php_http_info.c
index 10ea0a3c0ad7a114bb58ec3a78de6563115633d4..2c0f11474b810886962de0861ac6ea25da8e9c5c 100644
(file)
--- a/
php_http_info.c
+++ b/
php_http_info.c
@@
-27,12
+27,12
@@
void php_http_info_dtor(php_http_info_t *i)
{
switch (i->type) {
case PHP_HTTP_REQUEST:
{
switch (i->type) {
case PHP_HTTP_REQUEST:
-
S
TR_SET(PHP_HTTP_INFO(i).request.method, NULL);
-
S
TR_SET(PHP_HTTP_INFO(i).request.url, NULL);
+
P
TR_SET(PHP_HTTP_INFO(i).request.method, NULL);
+
P
TR_SET(PHP_HTTP_INFO(i).request.url, NULL);
break;
case PHP_HTTP_RESPONSE:
break;
case PHP_HTTP_RESPONSE:
-
S
TR_SET(PHP_HTTP_INFO(i).response.status, NULL);
+
P
TR_SET(PHP_HTTP_INFO(i).response.status, NULL);
break;
default:
break;
default:
@@
-65,15
+65,15
@@
php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_head
}
/* there must be HTTP/1.x in the line */
}
/* there must be HTTP/1.x in the line */
- if (!(http = php_http_locate_str(pre_header, end - pre_header, "HTTP/
1.", lenof("HTTP/1.
")))) {
+ if (!(http = php_http_locate_str(pre_header, end - pre_header, "HTTP/
", lenof("HTTP/
")))) {
return NULL;
}
info = php_http_info_init(info TSRMLS_CC);
return NULL;
}
info = php_http_info_init(info TSRMLS_CC);
- /* and nothing than SPACE or NUL after HTTP/
1
.x */
+ /* and nothing than SPACE or NUL after HTTP/
X
.x */
if (!php_http_version_parse(&info->http.version, http TSRMLS_CC)
if (!php_http_version_parse(&info->http.version, http TSRMLS_CC)
- || (http[lenof("HTTP/
1.1")] && (!PHP_HTTP_IS_CTYPE(space, http[lenof("HTTP/1.1
")])))) {
+ || (http[lenof("HTTP/
X.x")] && (!PHP_HTTP_IS_CTYPE(space, http[lenof("HTTP/X.x
")])))) {
if (free_info) {
php_http_info_free(&info);
}
if (free_info) {
php_http_info_free(&info);
}
@@
-91,7
+91,7
@@
php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_head
/* is response */
if (pre_header == http) {
char *status = NULL;
/* is response */
if (pre_header == http) {
char *status = NULL;
- const char *code = http + sizeof("HTTP/
1.1
");
+ const char *code = http + sizeof("HTTP/
X.x
");
info->type = PHP_HTTP_RESPONSE;
while (' ' == *code) ++code;
info->type = PHP_HTTP_RESPONSE;
while (' ' == *code) ++code;
@@
-111,7
+111,7
@@
php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_head
}
/* is request */
}
/* is request */
- else if (*(http - 1) == ' ' && (!http[lenof("HTTP/
1.x")] || http[lenof("HTTP/1.x")] == '\r' || http[lenof("HTTP/1
.x")] == '\n')) {
+ else if (*(http - 1) == ' ' && (!http[lenof("HTTP/
X.x")] || http[lenof("HTTP/X.x")] == '\r' || http[lenof("HTTP/X
.x")] == '\n')) {
const char *url = strchr(pre_header, ' ');
info->type = PHP_HTTP_REQUEST;
const char *url = strchr(pre_header, ' ');
info->type = PHP_HTTP_REQUEST;
@@
-120,9
+120,9
@@
php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_head
while (' ' == *url) ++url;
while (' ' == *(http-1)) --http;
if (http > url) {
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 TSRMLS_CC
);
} else {
} else {
-
S
TR_SET(PHP_HTTP_INFO(info).request.method, NULL);
+
P
TR_SET(PHP_HTTP_INFO(info).request.method, NULL);
return NULL;
}
} else {
return NULL;
}
} else {
@@
-133,7
+133,7
@@
php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_head
return info;
}
return info;
}
- /* some darn header containing HTTP/
1
.x */
+ /* some darn header containing HTTP/
X
.x */
else {
if (free_info) {
php_http_info_free(&info);
else {
if (free_info) {
php_http_info_free(&info);