projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- added http_get_request_body()
[m6w6/ext-http]
/
http_methods.c
diff --git
a/http_methods.c
b/http_methods.c
index d71c2caa6d4d7a5f4756ac6baabea975c6eabba0..c18e5aec630aa7603f5e678ab23296862ed82b81 100644
(file)
--- a/
http_methods.c
+++ b/
http_methods.c
@@
-1133,7
+1133,7
@@
PHP_METHOD(HttpRequest, __destruct)
PHP_METHOD(HttpRequest, setOptions)
{
char *key = NULL;
PHP_METHOD(HttpRequest, setOptions)
{
char *key = NULL;
- long idx = 0;
+
u
long idx = 0;
zval *opts, *old_opts, **opt;
getObject(http_request_object, obj);
zval *opts, *old_opts, **opt;
getObject(http_request_object, obj);
@@
-2069,7
+2069,11
@@
PHP_METHOD(HttpRequest, getResponseMessage)
getObject(http_request_object, obj);
message = GET_PROP(obj, responseMessage);
getObject(http_request_object, obj);
message = GET_PROP(obj, responseMessage);
- RETVAL_OBJECT(message);
+ if (Z_TYPE_P(message) == IS_OBJECT) {
+ RETVAL_OBJECT(message);
+ } else {
+ RETURN_NULL();
+ }
}
}
/* }}} */
}
}
/* }}} */
@@
-2156,8
+2160,8
@@
PHP_METHOD(HttpRequest, send)
* }
* $pool->send();
* foreach ($urls as $url) {
* }
* $pool->send();
* foreach ($urls as $url) {
- * printf("%s (%s) is %s\n",
- * $url, $req[$url]->getResponseInfo('effective_url'),
+ * printf("%s (%s) is %s\n",
+ * $url, $req[$url]->getResponseInfo('effective_url'),
* $r->getResponseCode() == 200 ? 'alive' : 'not alive'
* );
* }
* $r->getResponseCode() == 200 ? 'alive' : 'not alive'
* );
* }
@@
-2255,11
+2259,16
@@
PHP_METHOD(HttpRequestPool, detach)
*/
PHP_METHOD(HttpRequestPool, send)
{
*/
PHP_METHOD(HttpRequestPool, send)
{
+ STATUS status;
getObject(http_requestpool_object, obj);
NO_ARGS;
getObject(http_requestpool_object, obj);
NO_ARGS;
- RETURN_SUCCESS(http_request_pool_send(&obj->pool));
+ SET_EH_THROW_HTTP();
+ status = http_request_pool_send(&obj->pool);
+ SET_EH_NORMAL();
+
+ RETURN_SUCCESS(status);
}
/* }}} */
}
/* }}} */