projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
release 3.2.3
[m6w6/ext-http]
/
src
/
php_http_client.c
diff --git
a/src/php_http_client.c
b/src/php_http_client.c
index 2f8b4aed62df35b79016a276930f21c4666b27b0..9551dd0bbe775f252a8893f090a17f06ddb5d36f 100644
(file)
--- a/
src/php_http_client.c
+++ b/
src/php_http_client.c
@@
-401,8
+401,9
@@
static HashTable *php_http_client_object_get_gc(zval *object, zval **table, int
for (el = obj->client->requests.head; el; el = el->next) {
php_http_client_enqueue_t *q = (php_http_client_enqueue_t *) el->data;
for (el = obj->client->requests.head; el; el = el->next) {
php_http_client_enqueue_t *q = (php_http_client_enqueue_t *) el->data;
- php_http_message_object_t *request_obj = q->opaque; /* FIXME */
- ZVAL_OBJ(&obj->gc[(*n)++], &request_obj->zo);
+ if (q->request_obj) {
+ ZVAL_OBJ(&obj->gc[(*n)++], &q->request_obj->zo);
+ }
}
ZEND_HASH_FOREACH_VAL(props, val)
}
ZEND_HASH_FOREACH_VAL(props, val)
@@
-583,7
+584,7
@@
static PHP_METHOD(HttpClient, __construct)
php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|S!S!", &driver_name, &persistent_handle_name), invalid_arg, return);
if (!zend_hash_num_elements(&php_http_client_drivers)) {
php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|S!S!", &driver_name, &persistent_handle_name), invalid_arg, return);
if (!zend_hash_num_elements(&php_http_client_drivers)) {
- php_http_throw(unexpected_val, "No http\\Client drivers available"
, NULL
);
+ php_http_throw(unexpected_val, "No http\\Client drivers available");
return;
}
if (!(driver = php_http_client_driver_get(driver_name))) {
return;
}
if (!(driver = php_http_client_driver_get(driver_name))) {
@@
-697,7
+698,7
@@
static PHP_METHOD(HttpClient, enqueue)
msg_obj = PHP_HTTP_OBJ(NULL, request);
if (php_http_client_enqueued(obj->client, msg_obj->message, NULL)) {
msg_obj = PHP_HTTP_OBJ(NULL, request);
if (php_http_client_enqueued(obj->client, msg_obj->message, NULL)) {
- php_http_throw(bad_method_call, "Failed to enqueue request; request already in queue"
, NULL
);
+ php_http_throw(bad_method_call, "Failed to enqueue request; request already in queue");
return;
}
return;
}
@@
-749,7
+750,7
@@
static PHP_METHOD(HttpClient, dequeue)
msg_obj = PHP_HTTP_OBJ(NULL, request);
if (!php_http_client_enqueued(obj->client, msg_obj->message, NULL)) {
msg_obj = PHP_HTTP_OBJ(NULL, request);
if (!php_http_client_enqueued(obj->client, msg_obj->message, NULL)) {
- php_http_throw(bad_method_call, "Failed to dequeue request; request not in queue"
, NULL
);
+ php_http_throw(bad_method_call, "Failed to dequeue request; request not in queue");
return;
}
return;
}
@@
-843,7
+844,7
@@
static PHP_METHOD(HttpClient, getResponse)
}
/* not found for the request! */
}
/* not found for the request! */
- php_http_throw(unexpected_val, "Could not find response for the request"
, NULL
);
+ php_http_throw(unexpected_val, "Could not find response for the request");
return;
}
return;
}
@@
-986,6
+987,7
@@
static int notify(zend_object_iterator *iter, void *puser)
ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_notify, 0, 0, 0)
ZEND_ARG_OBJ_INFO(0, request, http\\Client\\Request, 1)
ZEND_BEGIN_ARG_INFO_EX(ai_HttpClient_notify, 0, 0, 0)
ZEND_ARG_OBJ_INFO(0, request, http\\Client\\Request, 1)
+ ZEND_ARG_INFO(0, progress)
ZEND_END_ARG_INFO();
static PHP_METHOD(HttpClient, notify)
{
ZEND_END_ARG_INFO();
static PHP_METHOD(HttpClient, notify)
{
@@
-999,7
+1001,7
@@
static PHP_METHOD(HttpClient, notify)
observers = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("observers"), 0, &observers_tmp);
if (Z_TYPE_P(observers) != IS_OBJECT) {
observers = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("observers"), 0, &observers_tmp);
if (Z_TYPE_P(observers) != IS_OBJECT) {
- php_http_throw(unexpected_val, "Observer storage is corrupted"
, NULL
);
+ php_http_throw(unexpected_val, "Observer storage is corrupted");
return;
}
return;
}
@@
-1045,7
+1047,7
@@
static PHP_METHOD(HttpClient, attach)
observers = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("observers"), 0, &observers_tmp);
if (Z_TYPE_P(observers) != IS_OBJECT) {
observers = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("observers"), 0, &observers_tmp);
if (Z_TYPE_P(observers) != IS_OBJECT) {
- php_http_throw(unexpected_val, "Observer storage is corrupted"
, NULL
);
+ php_http_throw(unexpected_val, "Observer storage is corrupted");
return;
}
return;
}
@@
-1072,7
+1074,7
@@
static PHP_METHOD(HttpClient, detach)
observers = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("observers"), 0, &observers_tmp);
if (Z_TYPE_P(observers) != IS_OBJECT) {
observers = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("observers"), 0, &observers_tmp);
if (Z_TYPE_P(observers) != IS_OBJECT) {
- php_http_throw(unexpected_val, "Observer storage is corrupted"
, NULL
);
+ php_http_throw(unexpected_val, "Observer storage is corrupted");
return;
}
return;
}
@@
-1094,7
+1096,7
@@
static PHP_METHOD(HttpClient, getObservers)
observers = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("observers"), 0, &observers_tmp);
if (Z_TYPE_P(observers) != IS_OBJECT) {
observers = zend_read_property(php_http_client_class_entry, getThis(), ZEND_STRL("observers"), 0, &observers_tmp);
if (Z_TYPE_P(observers) != IS_OBJECT) {
- php_http_throw(unexpected_val, "Observer storage is corrupted"
, NULL
);
+ php_http_throw(unexpected_val, "Observer storage is corrupted");
return;
}
return;
}