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 (from parent 1:
0be5ad9
)
fix format warnings, closes #85
author
Michael Wallner
<mike@php.net>
Thu, 28 Feb 2019 09:13:19 +0000
(10:13 +0100)
committer
Michael Wallner
<mike@php.net>
Thu, 28 Feb 2019 09:13:19 +0000
(10:13 +0100)
src/php_http_client.c
patch
|
blob
|
history
src/php_http_client_response.c
patch
|
blob
|
history
src/php_http_encoding.c
patch
|
blob
|
history
src/php_http_env.c
patch
|
blob
|
history
src/php_http_exception.h
patch
|
blob
|
history
src/php_http_message.c
patch
|
blob
|
history
src/php_http_querystring.c
patch
|
blob
|
history
diff --git
a/src/php_http_client.c
b/src/php_http_client.c
index 2f8b4aed62df35b79016a276930f21c4666b27b0..317b494c306b7a7ada901d1ac8a11daaa2565dc1 100644
(file)
--- a/
src/php_http_client.c
+++ b/
src/php_http_client.c
@@
-583,7
+583,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
+697,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
+749,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
+843,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;
}
@@
-999,7
+999,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
+1045,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
+1072,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
+1094,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;
}
diff --git
a/src/php_http_client_response.c
b/src/php_http_client_response.c
index 5acddae163ab782a63f1312808b70c1beffe363d..34748aaa3e4a0b8ea4f53324c5eb2c2ce3885145 100644
(file)
--- a/
src/php_http_client_response.c
+++ b/
src/php_http_client_response.c
@@
-105,7
+105,7
@@
static PHP_METHOD(HttpClientResponse, getTransferInfo)
/* request completed? */
if (Z_TYPE_P(info) != IS_OBJECT) {
/* request completed? */
if (Z_TYPE_P(info) != IS_OBJECT) {
- php_http_throw(bad_method_call, "Incomplete state"
, NULL
);
+ php_http_throw(bad_method_call, "Incomplete state");
return;
}
return;
}
diff --git
a/src/php_http_encoding.c
b/src/php_http_encoding.c
index c3e9a3a5f618a4f119247fcfd0ce0fbdb0608a94..4e25de30a73a160cb6864908b94744c6c180bdc3 100644
(file)
--- a/
src/php_http_encoding.c
+++ b/
src/php_http_encoding.c
@@
-528,7
+528,7
@@
static PHP_METHOD(HttpEncodingStream, __construct)
obj = PHP_HTTP_OBJ(NULL, getThis());
if (UNEXPECTED(obj->stream)) {
obj = PHP_HTTP_OBJ(NULL, getThis());
if (UNEXPECTED(obj->stream)) {
- php_http_throw(bad_method_call, "http\\Encoding\\Stream cannot be initialized twice"
, NULL
);
+ php_http_throw(bad_method_call, "http\\Encoding\\Stream cannot be initialized twice");
return;
}
return;
}
diff --git
a/src/php_http_env.c
b/src/php_http_env.c
index 21bd89ab73d504a51a7c08ffe0a3dfec095bd7ca..4afcd312b45d16b1ac011896f1646bed01af14d8 100644
(file)
--- a/
src/php_http_env.c
+++ b/
src/php_http_env.c
@@
-501,7
+501,7
@@
ZEND_RESULT_CODE php_http_env_set_response_header_value(long http_code, const ch
return FAILURE;
}
h.response_code = http_code;
return FAILURE;
}
h.response_code = http_code;
- h.line_len = spprintf(&h.line, 0, "%
.*s: %.*s", (int) name_len, name_str, data->len
, data->val);
+ h.line_len = spprintf(&h.line, 0, "%
s: %s", name_str
, data->val);
ret = sapi_header_op(replace ? SAPI_HEADER_REPLACE : SAPI_HEADER_ADD, (void *) &h);
ret = sapi_header_op(replace ? SAPI_HEADER_REPLACE : SAPI_HEADER_ADD, (void *) &h);
diff --git
a/src/php_http_exception.h
b/src/php_http_exception.h
index e3e66f17403fd5379aad718065724e7c9f2c0f5e..a7a0f7e5945019937d18b084929cda1c9c2d7480 100644
(file)
--- a/
src/php_http_exception.h
+++ b/
src/php_http_exception.h
@@
-14,8
+14,8
@@
#define PHP_HTTP_EXCEPTION_H
/* short hand for zend_throw_exception_ex */
#define PHP_HTTP_EXCEPTION_H
/* short hand for zend_throw_exception_ex */
-#define php_http_throw(e,
fmt,
...) \
- zend_throw_exception_ex(php_http_get_exception_ ##e## _class_entry(), 0,
fmt,
__VA_ARGS__)
+#define php_http_throw(e, ...) \
+ zend_throw_exception_ex(php_http_get_exception_ ##e## _class_entry(), 0, __VA_ARGS__)
/* wrap a call with replaced zend_error_handling */
#define php_http_expect(test, e, fail) \
/* wrap a call with replaced zend_error_handling */
#define php_http_expect(test, e, fail) \
diff --git
a/src/php_http_message.c
b/src/php_http_message.c
index d70ced4993c5a16cd199e189f3a49e62c80a4166..a2c42a2b15e5f1bcffe7fe1ac91b55d12e1ddad1 100644
(file)
--- a/
src/php_http_message.c
+++ b/
src/php_http_message.c
@@
-776,7
+776,7
@@
ZEND_RESULT_CODE php_http_message_object_set_body(php_http_message_object_t *msg
case IS_RESOURCE:
php_stream_from_zval_no_verify(s, zbody);
if (!s) {
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 FAILURE;
}
@@
-1076,7
+1076,7
@@
static PHP_METHOD(HttpMessage, __construct)
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_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);
}
}
php_http_buffer_dtor(&buf);
@@
-1084,7
+1084,7
@@
static PHP_METHOD(HttpMessage, __construct)
}
if (!msg && !EG(exception)) {
}
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);
}
} else if (zmessage) {
zend_string *zs_msg = zval_get_string(zmessage);
@@
-1092,7
+1092,7
@@
static PHP_METHOD(HttpMessage, __construct)
msg = php_http_message_parse(NULL, zs_msg->val, zs_msg->len, greedy);
if (!msg && !EG(exception)) {
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);
}
}
zend_string_release(zs_msg);
}
@@
-1492,7
+1492,7
@@
static PHP_METHOD(HttpMessage, setResponseCode)
PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
if (obj->message->type != PHP_HTTP_RESPONSE) {
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;
}
return;
}
@@
-1544,7
+1544,7
@@
static PHP_METHOD(HttpMessage, setResponseStatus)
PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
if (obj->message->type != PHP_HTTP_RESPONSE) {
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));
}
PTR_SET(obj->message->http.info.response.status, estrndup(status, status_len));
@@
-1589,12
+1589,12
@@
static PHP_METHOD(HttpMessage, setRequestMethod)
PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
if (obj->message->type != PHP_HTTP_REQUEST) {
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) {
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;
}
return;
}
@@
-1645,7
+1645,7
@@
static PHP_METHOD(HttpMessage, setRequestUrl)
PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
if (obj->message->type != PHP_HTTP_REQUEST) {
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;
}
return;
}
@@
-1655,7
+1655,7
@@
static PHP_METHOD(HttpMessage, setRequestUrl)
if (url && php_http_url_is_empty(url)) {
php_http_url_free(&url);
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);
}
} else if (url) {
PTR_SET(obj->message->http.info.request.url, url);
}
@@
-1675,7
+1675,7
@@
static PHP_METHOD(HttpMessage, getParentMessage)
PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
if (!obj->message->parent) {
PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
if (!obj->message->parent) {
- php_http_throw(unexpected_val, "http\\Message has no
t parent message", NULL
);
+ php_http_throw(unexpected_val, "http\\Message has no
parent message"
);
return;
}
return;
}
@@
-1832,7
+1832,7
@@
static PHP_METHOD(HttpMessage, prepend)
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]) {
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;
}
}
return;
}
}
@@
-1892,7
+1892,7
@@
static PHP_METHOD(HttpMessage, splitMultipartBody)
PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
if (!php_http_message_is_multipart(obj->message, &boundary)) {
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;
}
return;
}
diff --git
a/src/php_http_querystring.c
b/src/php_http_querystring.c
index a302bbd732dc2167bfacebde87396395f05e277a..f3d1f1d7100c6287d032b74f178a781bdea680fa 100644
(file)
--- a/
src/php_http_querystring.c
+++ b/
src/php_http_querystring.c
@@
-103,7
+103,7
@@
ZEND_RESULT_CODE php_http_querystring_xlate(zval *dst, zval *src, const char *ie
{
if (key.key) {
if (PHP_ICONV_ERR_SUCCESS != php_iconv_string(key.key->val, key.key->len, &xkey, oe, ie)) {
{
if (key.key) {
if (PHP_ICONV_ERR_SUCCESS != php_iconv_string(key.key->val, key.key->len, &xkey, oe, ie)) {
- php_error_docref(NULL, E_WARNING, "Failed to convert '%.*s' from '%s' to '%s'", key.key->len, key.key->val, ie, oe);
+ php_error_docref(NULL, E_WARNING, "Failed to convert '%.*s' from '%s' to '%s'",
(int)
key.key->len, key.key->val, ie, oe);
return FAILURE;
}
}
return FAILURE;
}
}
@@
-113,7
+113,7
@@
ZEND_RESULT_CODE php_http_querystring_xlate(zval *dst, zval *src, const char *ie
if (key.key) {
zend_string_release(xkey);
}
if (key.key) {
zend_string_release(xkey);
}
- php_error_docref(NULL, E_WARNING, "Failed to convert '%.*s' from '%s' to '%s'", Z_STRLEN_P(entry), Z_STRVAL_P(entry), ie, oe);
+ php_error_docref(NULL, E_WARNING, "Failed to convert '%.*s' from '%s' to '%s'",
(int)
Z_STRLEN_P(entry), Z_STRVAL_P(entry), ie, oe);
return FAILURE;
}
if (key.key) {
return FAILURE;
}
if (key.key) {
@@
-386,7
+386,7
@@
PHP_METHOD(HttpQueryString, getGlobalInstance)
ZVAL_MAKE_REF(_GET);
zend_update_property(php_http_querystring_class_entry, return_value, ZEND_STRL("queryArray"), _GET);
} else {
ZVAL_MAKE_REF(_GET);
zend_update_property(php_http_querystring_class_entry, return_value, ZEND_STRL("queryArray"), _GET);
} else {
- php_http_throw(unexpected_val, "Could not acquire reference to superglobal GET array"
, NULL
);
+ php_http_throw(unexpected_val, "Could not acquire reference to superglobal GET array");
}
}
}
}