projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
followup to #122
[m6w6/ext-http]
/
src
/
php_http_message.c
diff --git
a/src/php_http_message.c
b/src/php_http_message.c
index d09b0b46f4cd874ccc485b0e00b533521f1acde3..ac3c641968ac9a944041970fbac23b762b935492 100644
(file)
--- a/
src/php_http_message.c
+++ b/
src/php_http_message.c
@@
-688,6
+688,8
@@
static void php_http_message_object_prophandler_set_parent_message(php_http_mess
do { \
if (!obj->message) { \
obj->message = php_http_message_init(NULL, 0, NULL); \
do { \
if (!obj->message) { \
obj->message = php_http_message_init(NULL, 0, NULL); \
+ } else if (!obj->body && php_http_message_body_size(obj->message->body)) { \
+ php_http_message_object_init_body_object(obj); \
} \
} while(0)
} \
} while(0)
@@
-1969,7
+1971,7
@@
static PHP_METHOD(HttpMessage, splitMultipartBody)
RETURN_OBJ(&php_http_message_object_new_ex(obj->zo.ce, msg)->zo);
}
RETURN_OBJ(&php_http_message_object_new_ex(obj->zo.ce, msg)->zo);
}
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(ai_HttpMessage_count, 0, 0, IS_LONG, 0)
+ZEND_BEGIN_ARG_WITH_
TENTATIVE_
RETURN_TYPE_INFO_EX(ai_HttpMessage_count, 0, 0, IS_LONG, 0)
ZEND_END_ARG_INFO();
static PHP_METHOD(HttpMessage, count)
{
ZEND_END_ARG_INFO();
static PHP_METHOD(HttpMessage, count)
{
@@
-1984,7
+1986,7
@@
static PHP_METHOD(HttpMessage, count)
}
}
}
}
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(ai_HttpMessage_rewind, 0, 0, IS_VOID, 0)
+ZEND_BEGIN_ARG_WITH_
TENTATIVE_
RETURN_TYPE_INFO_EX(ai_HttpMessage_rewind, 0, 0, IS_VOID, 0)
ZEND_END_ARG_INFO();
static PHP_METHOD(HttpMessage, rewind)
{
ZEND_END_ARG_INFO();
static PHP_METHOD(HttpMessage, rewind)
{
@@
-1999,7
+2001,7
@@
static PHP_METHOD(HttpMessage, rewind)
}
}
}
}
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(ai_HttpMessage_valid, 0, 0, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_WITH_
TENTATIVE_
RETURN_TYPE_INFO_EX(ai_HttpMessage_valid, 0, 0, _IS_BOOL, 0)
ZEND_END_ARG_INFO();
static PHP_METHOD(HttpMessage, valid)
{
ZEND_END_ARG_INFO();
static PHP_METHOD(HttpMessage, valid)
{
@@
-2010,7
+2012,7
@@
static PHP_METHOD(HttpMessage, valid)
}
}
}
}
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(ai_HttpMessage_next, 0, 0, IS_VOID, 0)
+ZEND_BEGIN_ARG_WITH_
TENTATIVE_
RETURN_TYPE_INFO_EX(ai_HttpMessage_next, 0, 0, IS_VOID, 0)
ZEND_END_ARG_INFO();
static PHP_METHOD(HttpMessage, next)
{
ZEND_END_ARG_INFO();
static PHP_METHOD(HttpMessage, next)
{
@@
-2034,7
+2036,7
@@
static PHP_METHOD(HttpMessage, next)
}
}
}
}
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(ai_HttpMessage_key, 0, 0, IS_LONG, 0)
+ZEND_BEGIN_ARG_WITH_
TENTATIVE_
RETURN_TYPE_INFO_EX(ai_HttpMessage_key, 0, 0, IS_LONG, 0)
ZEND_END_ARG_INFO();
static PHP_METHOD(HttpMessage, key)
{
ZEND_END_ARG_INFO();
static PHP_METHOD(HttpMessage, key)
{
@@
-2045,7
+2047,7
@@
static PHP_METHOD(HttpMessage, key)
}
}
}
}
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_HttpMessage_current, 0, 0, http\\Message, 0)
+ZEND_BEGIN_ARG_WITH_
TENTATIVE_
RETURN_OBJ_INFO_EX(ai_HttpMessage_current, 0, 0, http\\Message, 0)
ZEND_END_ARG_INFO();
static PHP_METHOD(HttpMessage, current)
{
ZEND_END_ARG_INFO();
static PHP_METHOD(HttpMessage, current)
{