| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-2005, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-2006, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
{
case IS_HTTP_REQUEST:
(*message)->type = HTTP_MSG_REQUEST;
- HTTP_INFO(*message).request.URI = estrdup(HTTP_INFO(info).request.URI);
+ HTTP_INFO(*message).request.url = estrdup(HTTP_INFO(info).request.url);
HTTP_INFO(*message).request.method = estrdup(HTTP_INFO(info).request.method);
break;
case HTTP_MSG_REQUEST:
message->http.info.request.method = NULL;
- message->http.info.request.URI = NULL;
+ message->http.info.request.url = NULL;
break;
case HTTP_MSG_NONE:
{
case HTTP_MSG_REQUEST:
STR_FREE(message->http.info.request.method);
- STR_FREE(message->http.info.request.URI);
+ STR_FREE(message->http.info.request.url);
break;
case HTTP_MSG_RESPONSE:
if ( !strcasecmp(Z_STRVAL_P(c), "gzip") ||
!strcasecmp(Z_STRVAL_P(c), "x-gzip") ||
- !strcasecmp(Z_STRVAL_P(c), "deflate") ||
- !strcasecmp(Z_STRVAL_P(c), "compress") ||
- !strcasecmp(Z_STRVAL_P(c), "x-compress")) {
+ !strcasecmp(Z_STRVAL_P(c), "deflate")) {
http_encoding_inflate(PHPSTR_VAL(msg), PHPSTR_LEN(msg), &decoded, &decoded_len);
}
case HTTP_MSG_REQUEST:
phpstr_appendf(&str, "%s %s HTTP/%1.1f" HTTP_CRLF,
msg->http.info.request.method,
- msg->http.info.request.URI,
+ msg->http.info.request.url,
msg->http.version);
break;
case HTTP_MSG_REQUEST:
add_assoc_string(&strct, "requestMethod", msg->http.info.request.method, 1);
- add_assoc_string(&strct, "requestUri", msg->http.info.request.URI, 1);
+ add_assoc_string(&strct, "requestUrl", msg->http.info.request.url, 1);
break;
case HTTP_MSG_NONE:
/* check host header */
if (SUCCESS == zend_hash_find(&message->hdrs, "Host", sizeof("Host"), (void **) &zhost)) {
char *colon = NULL;
- php_url parts, *url = php_url_parse(message->http.info.request.URI);
+ php_url parts, *url = php_url_parse(message->http.info.request.url);
memset(&parts, 0, sizeof(php_url));
php_url_free(url);
efree(parts.host);
} else {
- uri = http_absolute_url(message->http.info.request.URI);
+ uri = http_absolute_url(message->http.info.request.url);
}
if ((request.meth = http_request_method_exists(1, 0, message->http.info.request.method))) {
{
case HTTP_MSG_REQUEST:
STR_SET(message->http.info.request.method, NULL);
- STR_SET(message->http.info.request.URI, NULL);
+ STR_SET(message->http.info.request.url, NULL);
break;
case HTTP_MSG_RESPONSE: