projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
zend_string updates
[m6w6/ext-http]
/
php_http_info.c
diff --git
a/php_http_info.c
b/php_http_info.c
index 2f1b746fa95d185db515896b87c6ef2c2532133b..f0fe7ad72bcc703b4e259a240498e72a4985e5af 100644
(file)
--- a/
php_http_info.c
+++ b/
php_http_info.c
@@
-12,7
+12,7
@@
#include "php_http_api.h"
#include "php_http_api.h"
-php_http_info_t *php_http_info_init(php_http_info_t *i
TSRMLS_DC
)
+php_http_info_t *php_http_info_init(php_http_info_t *i)
{
if (!i) {
i = emalloc(sizeof(*i));
{
if (!i) {
i = emalloc(sizeof(*i));
@@
-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:
@@
-49,7
+49,7
@@
void php_http_info_free(php_http_info_t **i)
}
}
}
}
-php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_header
TSRMLS_DC
)
+php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_header)
{
const char *end, *http;
zend_bool free_info = !info;
{
const char *end, *http;
zend_bool free_info = !info;
@@
-72,7
+72,7
@@
php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_head
info = php_http_info_init(info TSRMLS_CC);
/* and nothing than SPACE or NUL after HTTP/1.x */
info = php_http_info_init(info TSRMLS_CC);
/* and nothing than SPACE or NUL after HTTP/1.x */
- if (!php_http_version_parse(&info->http.version, http
TSRMLS_CC
)
+ if (!php_http_version_parse(&info->http.version, http)
|| (http[lenof("HTTP/1.1")] && (!PHP_HTTP_IS_CTYPE(space, http[lenof("HTTP/1.1")])))) {
if (free_info) {
php_http_info_free(&info);
|| (http[lenof("HTTP/1.1")] && (!PHP_HTTP_IS_CTYPE(space, http[lenof("HTTP/1.1")])))) {
if (free_info) {
php_http_info_free(&info);
@@
-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 = php_http_url_parse(url, http - url, ~0
TSRMLS_CC
);
+ PHP_HTTP_INFO(info).request.url = php_http_url_parse(url, http - url, ~0);
} 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 {