}
static zval *php_http_message_object_read_prop(zval *object, zval *member, int type, void **cache_slot, zval *rv);
-static void php_http_message_object_write_prop(zval *object, zval *member, zval *value, void **cache_slot);
+
+static PHP_WRITE_PROP_HANDLER_TYPE php_http_message_object_write_prop(zval *object, zval *member, zval *value, void **cache_slot);
static zend_object_handlers php_http_message_object_handlers;
static HashTable php_http_message_object_prophandlers;
case IS_RESOURCE:
php_stream_from_zval_no_verify(s, zbody);
if (!s) {
- php_http_throw(unexpected_val, "The stream is not a valid resource", NULL);
+ php_http_throw(unexpected_val, "The stream is not a valid resource");
return FAILURE;
}
return return_value;
}
-static void php_http_message_object_write_prop(zval *object, zval *member, zval *value, void **cache_slot)
+static PHP_WRITE_PROP_HANDLER_TYPE php_http_message_object_write_prop(zval *object, zval *member, zval *value, void **cache_slot)
{
php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, object);
php_http_message_object_prophandler_t *handler;
}
zend_string_release(member_name);
+ PHP_WRITE_PROP_HANDLER_RETURN(value);
}
static HashTable *php_http_message_object_get_debug_info(zval *object, int *is_temp)
php_http_buffer_init_ex(&buf, 0x1000, PHP_HTTP_BUFFER_INIT_PREALLOC);
if (PHP_HTTP_MESSAGE_PARSER_STATE_FAILURE == php_http_message_parser_parse_stream(&p, &buf, s, flags, &msg)) {
if (!EG(exception)) {
- php_http_throw(bad_message, "Could not parse message from stream", NULL);
+ php_http_throw(bad_message, "Could not parse message from stream");
}
}
php_http_buffer_dtor(&buf);
}
if (!msg && !EG(exception)) {
- php_http_throw(bad_message, "Empty message received from stream", NULL);
+ php_http_throw(bad_message, "Empty message received from stream");
}
} else if (zmessage) {
zend_string *zs_msg = zval_get_string(zmessage);
msg = php_http_message_parse(NULL, zs_msg->val, zs_msg->len, greedy);
if (!msg && !EG(exception)) {
- php_http_throw(bad_message, "Could not parse message: %.*s", MIN(25, zs_msg->len), zs_msg->val);
+ php_http_throw(bad_message, "Could not parse message: %.*s", (int) MIN(25, zs_msg->len), zs_msg->val);
}
zend_string_release(zs_msg);
}
PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
if (obj->message->type != PHP_HTTP_RESPONSE) {
- php_http_throw(bad_method_call, "http\\Message is not of type response", NULL);
+ php_http_throw(bad_method_call, "http\\Message is not of type response");
return;
}
PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
if (obj->message->type != PHP_HTTP_RESPONSE) {
- php_http_throw(bad_method_call, "http\\Message is not of type response", NULL);
+ php_http_throw(bad_method_call, "http\\Message is not of type response");
}
PTR_SET(obj->message->http.info.response.status, estrndup(status, status_len));
PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
if (obj->message->type != PHP_HTTP_REQUEST) {
- php_http_throw(bad_method_call, "http\\Message is not of type request", NULL);
+ php_http_throw(bad_method_call, "http\\Message is not of type request");
return;
}
if (method_len < 1) {
- php_http_throw(invalid_arg, "Cannot set http\\Message's request method to an empty string", NULL);
+ php_http_throw(invalid_arg, "Cannot set http\\Message's request method to an empty string");
return;
}
PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
if (obj->message->type != PHP_HTTP_REQUEST) {
- php_http_throw(bad_method_call, "http\\Message is not of type request", NULL);
+ php_http_throw(bad_method_call, "http\\Message is not of type request");
return;
}
if (url && php_http_url_is_empty(url)) {
php_http_url_free(&url);
- php_http_throw(invalid_arg, "Cannot set http\\Message's request url to an empty string", NULL);
+ php_http_throw(invalid_arg, "Cannot set http\\Message's request url to an empty string");
} else if (url) {
PTR_SET(obj->message->http.info.request.url, url);
}
PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
if (!obj->message->parent) {
- php_http_throw(unexpected_val, "http\\Message has not parent message", NULL);
+ php_http_throw(unexpected_val, "http\\Message has no parent message");
return;
}
for (msg[0] = obj->message; msg[0]; msg[0] = msg[0]->parent) {
for (msg[1] = prepend_obj->message; msg[1]; msg[1] = msg[1]->parent) {
if (msg[0] == msg[1]) {
- php_http_throw(unexpected_val, "Cannot prepend a message located within the same message chain", NULL);
+ php_http_throw(unexpected_val, "Cannot prepend a message located within the same message chain");
return;
}
}
PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
if (!php_http_message_is_multipart(obj->message, &boundary)) {
- php_http_throw(bad_method_call, "http\\Message is not a multipart message", NULL);
+ php_http_throw(bad_method_call, "http\\Message is not a multipart message");
return;
}
}
static zend_function_entry php_http_message_methods[] = {
- PHP_ME(HttpMessage, __construct, ai_HttpMessage___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+ PHP_ME(HttpMessage, __construct, ai_HttpMessage___construct, ZEND_ACC_PUBLIC)
PHP_ME(HttpMessage, getBody, ai_HttpMessage_getBody, ZEND_ACC_PUBLIC)
PHP_ME(HttpMessage, setBody, ai_HttpMessage_setBody, ZEND_ACC_PUBLIC)
PHP_ME(HttpMessage, addBody, ai_HttpMessage_addBody, ZEND_ACC_PUBLIC)