projects
/
m6w6
/
ext-http
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (parent:
f965593
)
Fixed Bug #17896 Make failed
author
Michael Wallner
<mike@php.net>
Thu, 5 May 2011 06:43:10 +0000
(06:43 +0000)
committer
Michael Wallner
<mike@php.net>
Thu, 5 May 2011 06:43:10 +0000
(06:43 +0000)
package.xml
patch
|
blob
|
history
php_http_std_defs.h
patch
|
blob
|
history
diff --git
a/package.xml
b/package.xml
index 4e835219ba98b529525c668d9149832b3d53d65d..42a217614f0a0eecd23fa02a0fb6ffb12c7942fe 100644
(file)
--- a/
package.xml
+++ b/
package.xml
@@
-45,6
+45,7
@@
support. Parallel requests are available for PHP 5 and greater.
* Fixed Bug #22177 (http_redirect breaks output with zlib.output_compression=on)
* Fixed Bug #17806 (Segmentation fault when passing invalid url to http_get())
* Fixed logic error and possible hang in sapi_deactivate when using http_get_request_body() with a request body longer than 4096 bytes (Rob)
* Fixed Bug #22177 (http_redirect breaks output with zlib.output_compression=on)
* Fixed Bug #17806 (Segmentation fault when passing invalid url to http_get())
* Fixed logic error and possible hang in sapi_deactivate when using http_get_request_body() with a request body longer than 4096 bytes (Rob)
+ * Fixed Bug #17896 (Make failed)
]]></notes>
<contents>
<dir name="/">
]]></notes>
<contents>
<dir name="/">
diff --git
a/php_http_std_defs.h
b/php_http_std_defs.h
index 456ae74ca4a8f2a04d0af87bc53d926adfca7050..1b08ffdd4c7dbf2e90297cb4d5c5da5dd0566b72 100644
(file)
--- a/
php_http_std_defs.h
+++ b/
php_http_std_defs.h
@@
-329,6
+329,13
@@
typedef int STATUS;
ZEND_ARG_PASS_INFO(0) \
ZEND_ARG_PASS_INFO(1) \
ZEND_END_ARG_INFO(); \
ZEND_ARG_PASS_INFO(0) \
ZEND_ARG_PASS_INFO(1) \
ZEND_END_ARG_INFO(); \
+\
+ HTTP_STATIC_ARG_INFO \
+ ZEND_BEGIN_ARG_INFO(http_arg_pass_ref_3, 0) \
+ ZEND_ARG_PASS_INFO(0) \
+ ZEND_ARG_PASS_INFO(0) \
+ ZEND_ARG_PASS_INFO(1) \
+ ZEND_END_ARG_INFO(); \
\
HTTP_STATIC_ARG_INFO \
ZEND_BEGIN_ARG_INFO(http_arg_pass_ref_4, 0) \
\
HTTP_STATIC_ARG_INFO \
ZEND_BEGIN_ARG_INFO(http_arg_pass_ref_4, 0) \
@@
-340,6
+347,7
@@
typedef int STATUS;
# else
# define HTTP_DECLARE_ARG_PASS_INFO() \
static unsigned char http_arg_pass_ref_2[] = {2, BYREF_NONE, BYREF_FORCE}; \
# else
# define HTTP_DECLARE_ARG_PASS_INFO() \
static unsigned char http_arg_pass_ref_2[] = {2, BYREF_NONE, BYREF_FORCE}; \
+ static unsigned char http_arg_pass_ref_3[] = {3, BYREF_NONE, BYREF_NONE, BYREF_FORCE}; \
static unsigned char http_arg_pass_ref_4[] = {4, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_FORCE};
# endif /* ZEND_ENGINE_2 */
#endif /* HTTP_HAVE_CURL */
static unsigned char http_arg_pass_ref_4[] = {4, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_FORCE};
# endif /* ZEND_ENGINE_2 */
#endif /* HTTP_HAVE_CURL */