projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- Disallow $HttpMessage->prepend($HttpMessage) causing infinite recursion
[m6w6/ext-http]
/
http_util_object.c
diff --git
a/http_util_object.c
b/http_util_object.c
index 03429f44e167fc18858ac4ea7b71e626dd2ef678..1bcf8a7e2458bc833c6896897ba696764a9f620b 100644
(file)
--- a/
http_util_object.c
+++ b/
http_util_object.c
@@
-6,37
+6,40
@@
| 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
-
#include "php_http.h"
#ifdef ZEND_ENGINE_2
#include "php_http.h"
#ifdef ZEND_ENGINE_2
+#include "ext/standard/php_http.h"
+
#include "php_http_util_object.h"
#include "php_http_util_object.h"
-#define HTTP_BEGIN_ARGS(method, req_args)
HTTP_BEGIN_ARGS_EX(HttpUtil, method, 0, req_args)
-#define HTTP_EMPTY_ARGS(method
, ret_ref) HTTP_EMPTY_ARGS_EX(HttpUtil, method, ret_ref
)
+#define HTTP_BEGIN_ARGS(method, req_args) HTTP_BEGIN_ARGS_EX(HttpUtil, method, 0, req_args)
+#define HTTP_EMPTY_ARGS(method
) HTTP_EMPTY_ARGS_EX(HttpUtil, method, 0
)
-#define HTTP_UTIL_ALIAS(method, func)
HTTP_STATIC_ME_ALIAS(method, func, HTTP_ARGS(HttpUtil, method))
+#define HTTP_UTIL_ALIAS(method, func) HTTP_STATIC_ME_ALIAS(method, func, HTTP_ARGS(HttpUtil, method))
HTTP_BEGIN_ARGS(date, 0)
HTTP_ARG_VAL(timestamp, 0)
HTTP_END_ARGS;
HTTP_BEGIN_ARGS(date, 0)
HTTP_ARG_VAL(timestamp, 0)
HTTP_END_ARGS;
-HTTP_BEGIN_ARGS(buildUri, 1)
+HTTP_BEGIN_ARGS(buildStr, 1)
+ HTTP_ARG_VAL(query, 0)
+ HTTP_ARG_VAL(prefix, 0)
+ HTTP_ARG_VAL(arg_sep, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(buildUrl, 1)
HTTP_ARG_VAL(url, 0)
HTTP_ARG_VAL(url, 0)
- HTTP_ARG_VAL(p
roto
, 0)
- HTTP_ARG_VAL(
host
, 0)
- HTTP_ARG_VAL(
port, 0
)
+ HTTP_ARG_VAL(p
arts
, 0)
+ HTTP_ARG_VAL(
flags
, 0)
+ HTTP_ARG_VAL(
composed, 1
)
HTTP_END_ARGS;
HTTP_BEGIN_ARGS(negotiateLanguage, 1)
HTTP_END_ARGS;
HTTP_BEGIN_ARGS(negotiateLanguage, 1)
@@
-86,20
+89,9
@@
HTTP_BEGIN_ARGS(chunkedDecode, 1)
HTTP_ARG_VAL(encoded_string, 0)
HTTP_END_ARGS;
HTTP_ARG_VAL(encoded_string, 0)
HTTP_END_ARGS;
-HTTP_BEGIN_ARGS(gzEncode, 1)
- HTTP_ARG_VAL(plain, 0)
- HTTP_ARG_VAL(level, 0)
- HTTP_ARG_VAL(mtime, 0)
-HTTP_END_ARGS;
-
-HTTP_BEGIN_ARGS(gzDecode, 1)
- HTTP_ARG_VAL(encoded, 0)
-HTTP_END_ARGS;
-
HTTP_BEGIN_ARGS(deflate, 1)
HTTP_ARG_VAL(plain, 0)
HTTP_BEGIN_ARGS(deflate, 1)
HTTP_ARG_VAL(plain, 0)
- HTTP_ARG_VAL(level, 0)
- HTTP_ARG_VAL(zlib_header, 0)
+ HTTP_ARG_VAL(flags, 0)
HTTP_END_ARGS;
HTTP_BEGIN_ARGS(inflate, 1)
HTTP_END_ARGS;
HTTP_BEGIN_ARGS(inflate, 1)
@@
-113,7
+105,8
@@
HTTP_END_ARGS;
zend_class_entry *http_util_object_ce;
zend_function_entry http_util_object_fe[] = {
HTTP_UTIL_ALIAS(date, http_date)
zend_class_entry *http_util_object_ce;
zend_function_entry http_util_object_fe[] = {
HTTP_UTIL_ALIAS(date, http_date)
- HTTP_UTIL_ALIAS(buildUri, http_build_uri)
+ HTTP_UTIL_ALIAS(buildUrl, http_build_url)
+ HTTP_UTIL_ALIAS(buildStr, http_build_str)
HTTP_UTIL_ALIAS(negotiateLanguage, http_negotiate_language)
HTTP_UTIL_ALIAS(negotiateCharset, http_negotiate_charset)
HTTP_UTIL_ALIAS(negotiateContentType, http_negotiate_content_type)
HTTP_UTIL_ALIAS(negotiateLanguage, http_negotiate_language)
HTTP_UTIL_ALIAS(negotiateCharset, http_negotiate_charset)
HTTP_UTIL_ALIAS(negotiateContentType, http_negotiate_content_type)
@@
-125,8
+118,6
@@
zend_function_entry http_util_object_fe[] = {
HTTP_UTIL_ALIAS(parseCookie, http_parse_cookie)
HTTP_UTIL_ALIAS(chunkedDecode, http_chunked_decode)
#ifdef HTTP_HAVE_ZLIB
HTTP_UTIL_ALIAS(parseCookie, http_parse_cookie)
HTTP_UTIL_ALIAS(chunkedDecode, http_chunked_decode)
#ifdef HTTP_HAVE_ZLIB
- HTTP_UTIL_ALIAS(gzEncode, http_gzencode)
- HTTP_UTIL_ALIAS(gzDecode, http_gzdecode)
HTTP_UTIL_ALIAS(deflate, http_deflate)
HTTP_UTIL_ALIAS(inflate, http_inflate)
#endif /* HTTP_HAVE_ZLIB */
HTTP_UTIL_ALIAS(deflate, http_deflate)
HTTP_UTIL_ALIAS(inflate, http_inflate)
#endif /* HTTP_HAVE_ZLIB */