projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- some housekeeping
[m6w6/ext-http]
/
http_message_api.c
diff --git
a/http_message_api.c
b/http_message_api.c
index 5f517010adbd1201b45120d4746a21abe2326f4a..93c4bf1d5cbb1ba027511b45d3f2db12d769b59e 100644
(file)
--- a/
http_message_api.c
+++ b/
http_message_api.c
@@
-6,22
+6,17
@@
| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-200
5
, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-200
6
, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
/* $Id$ */
+--------------------------------------------------------------------+
*/
/* $Id$ */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
+#define HTTP_WANT_SAPI
#define HTTP_WANT_CURL
#define HTTP_WANT_ZLIB
#include "php_http.h"
#define HTTP_WANT_CURL
#define HTTP_WANT_ZLIB
#include "php_http.h"
-#include "SAPI.h"
-
#include "php_http_api.h"
#include "php_http_encoding_api.h"
#include "php_http_headers_api.h"
#include "php_http_api.h"
#include "php_http_encoding_api.h"
#include "php_http_headers_api.h"
@@
-48,7
+43,7
@@
static void _http_message_info_callback(http_message **message, HashTable **head
{
case IS_HTTP_REQUEST:
(*message)->type = HTTP_MSG_REQUEST;
{
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;
HTTP_INFO(*message).request.method = estrdup(HTTP_INFO(info).request.method);
break;
@@
-74,7
+69,7
@@
static inline void _http_message_init_type(http_message *message, http_message_t
case HTTP_MSG_REQUEST:
message->http.info.request.method = NULL;
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:
break;
case HTTP_MSG_NONE:
@@
-108,7
+103,7
@@
PHP_HTTP_API void _http_message_set_type(http_message *message, http_message_typ
{
case HTTP_MSG_REQUEST:
STR_FREE(message->http.info.request.method);
{
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:
break;
case HTTP_MSG_RESPONSE:
@@
-233,9
+228,7
@@
PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char
if ( !strcasecmp(Z_STRVAL_P(c), "gzip") ||
!strcasecmp(Z_STRVAL_P(c), "x-gzip") ||
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);
}
http_encoding_inflate(PHPSTR_VAL(msg), PHPSTR_LEN(msg), &decoded, &decoded_len);
}
@@
-301,7
+294,7
@@
PHP_HTTP_API void _http_message_tostring(http_message *msg, char **string, size_
case HTTP_MSG_REQUEST:
phpstr_appendf(&str, "%s %s HTTP/%1.1f" HTTP_CRLF,
msg->http.info.request.method,
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;
msg->http.version);
break;
@@
-396,7
+389,7
@@
PHP_HTTP_API void _http_message_tostruct_recursive(http_message *msg, zval *obj
case HTTP_MSG_REQUEST:
add_assoc_string(&strct, "requestMethod", msg->http.info.request.method, 1);
case HTTP_MSG_REQUEST:
add_assoc_string(&strct, "requestMethod", msg->http.info.request.method, 1);
- add_assoc_string(&strct, "requestUr
i", msg->http.info.request.URI
, 1);
+ add_assoc_string(&strct, "requestUr
l", msg->http.info.request.url
, 1);
break;
case HTTP_MSG_NONE:
break;
case HTTP_MSG_NONE:
@@
-480,7
+473,7
@@
PHP_HTTP_API STATUS _http_message_send(http_message *message TSRMLS_DC)
/* check host header */
if (SUCCESS == zend_hash_find(&message->hdrs, "Host", sizeof("Host"), (void **) &zhost)) {
char *colon = NULL;
/* 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));
memset(&parts, 0, sizeof(php_url));
@@
-496,7
+489,7
@@
PHP_HTTP_API STATUS _http_message_send(http_message *message TSRMLS_DC)
php_url_free(url);
efree(parts.host);
} else {
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))) {
}
if ((request.meth = http_request_method_exists(1, 0, message->http.info.request.method))) {
@@
-554,7
+547,7
@@
PHP_HTTP_API void _http_message_dtor(http_message *message)
{
case HTTP_MSG_REQUEST:
STR_SET(message->http.info.request.method, NULL);
{
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:
break;
case HTTP_MSG_RESPONSE: