projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- avoid warning in http_encoding_inflate_stream_finish()
[m6w6/ext-http]
/
http_request_object.c
diff --git
a/http_request_object.c
b/http_request_object.c
index 207ec6c3da02fd4923196b263cead20f22b3824b..7fa8ead74710fc894fb3d1cc983ee8a0ce537fad 100644
(file)
--- a/
http_request_object.c
+++ b/
http_request_object.c
@@
-524,7
+524,7
@@
STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_
{
case HTTP_GET:
case HTTP_HEAD:
{
case HTTP_GET:
case HTTP_HEAD:
- break;
+
break;
case HTTP_PUT:
{
case HTTP_PUT:
{
@@
-544,8
+544,8
@@
STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_
status = FAILURE;
}
}
status = FAILURE;
}
}
+ break;
}
}
- break;
case HTTP_POST:
default:
case HTTP_POST:
default:
@@
-571,8
+571,8
@@
STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_
}
}
}
}
}
}
+ break;
}
}
- break;
}
if (status == SUCCESS) {
}
if (status == SUCCESS) {
@@
-772,7
+772,7
@@
static inline void _http_request_get_options_subr(INTERNAL_FUNCTION_PARAMETERS,
{
NO_ARGS;
{
NO_ARGS;
-
IF_RETVAL_USED
{
+
if (return_value_used)
{
zval *opts, **options;
opts = GET_PROP(options);
zval *opts, **options;
opts = GET_PROP(options);
@@
-900,7
+900,7
@@
PHP_METHOD(HttpRequest, getOptions)
{
NO_ARGS;
{
NO_ARGS;
-
IF_RETVAL_USED
{
+
if (return_value_used)
{
RETURN_PROP(options);
}
}
RETURN_PROP(options);
}
}
@@
-1062,7
+1062,7
@@
PHP_METHOD(HttpRequest, getUrl)
{
NO_ARGS;
{
NO_ARGS;
-
IF_RETVAL_USED
{
+
if (return_value_used)
{
RETURN_PROP(url);
}
}
RETURN_PROP(url);
}
}
@@
-1100,7
+1100,7
@@
PHP_METHOD(HttpRequest, getMethod)
{
NO_ARGS;
{
NO_ARGS;
-
IF_RETVAL_USED
{
+
if (return_value_used)
{
RETURN_PROP(method);
}
}
RETURN_PROP(method);
}
}
@@
-1143,7
+1143,7
@@
PHP_METHOD(HttpRequest, getContentType)
{
NO_ARGS;
{
NO_ARGS;
-
IF_RETVAL_USED
{
+
if (return_value_used)
{
RETURN_PROP(contentType);
}
}
RETURN_PROP(contentType);
}
}
@@
-1202,7
+1202,7
@@
PHP_METHOD(HttpRequest, getQueryData)
{
NO_ARGS;
{
NO_ARGS;
-
IF_RETVAL_USED
{
+
if (return_value_used)
{
RETURN_PROP(queryData);
}
}
RETURN_PROP(queryData);
}
}
@@
-1314,7
+1314,7
@@
PHP_METHOD(HttpRequest, getPostFields)
{
NO_ARGS;
{
NO_ARGS;
-
IF_RETVAL_USED
{
+
if (return_value_used)
{
RETURN_PROP(postFields);
}
}
RETURN_PROP(postFields);
}
}
@@
-1394,7
+1394,7
@@
PHP_METHOD(HttpRequest, getRawPostData)
{
NO_ARGS;
{
NO_ARGS;
-
IF_RETVAL_USED
{
+
if (return_value_used)
{
RETURN_PROP(rawPostData);
}
}
RETURN_PROP(rawPostData);
}
}
@@
-1492,7
+1492,7
@@
PHP_METHOD(HttpRequest, getPostFiles)
{
NO_ARGS;
{
NO_ARGS;
-
IF_RETVAL_USED
{
+
if (return_value_used)
{
RETURN_PROP(postFiles);
}
}
RETURN_PROP(postFiles);
}
}
@@
-1531,7
+1531,7
@@
PHP_METHOD(HttpRequest, getPutFile)
{
NO_ARGS;
{
NO_ARGS;
-
IF_RETVAL_USED
{
+
if (return_value_used)
{
RETURN_PROP(putFile);
}
}
RETURN_PROP(putFile);
}
}
@@
-1611,7
+1611,7
@@
PHP_METHOD(HttpRequest, getPutData)
{
NO_ARGS;
{
NO_ARGS;
-
IF_RETVAL_USED
{
+
if (return_value_used)
{
RETURN_PROP(putData);
}
}
RETURN_PROP(putData);
}
}
@@
-1632,7
+1632,7
@@
PHP_METHOD(HttpRequest, getResponseData)
{
NO_ARGS;
{
NO_ARGS;
-
IF_RETVAL_USED
{
+
if (return_value_used)
{
RETURN_PROP(responseData);
}
}
RETURN_PROP(responseData);
}
}
@@
-1653,7
+1653,7
@@
PHP_METHOD(HttpRequest, getResponseData)
*/
PHP_METHOD(HttpRequest, getResponseHeader)
{
*/
PHP_METHOD(HttpRequest, getResponseHeader)
{
-
IF_RETVAL_USED
{
+
if (return_value_used)
{
zval *data, **headers, **header;
char *header_name = NULL;
int header_len = 0;
zval *data, **headers, **header;
char *header_name = NULL;
int header_len = 0;
@@
-1691,7
+1691,7
@@
PHP_METHOD(HttpRequest, getResponseHeader)
*/
PHP_METHOD(HttpRequest, getResponseCookies)
{
*/
PHP_METHOD(HttpRequest, getResponseCookies)
{
-
IF_RETVAL_USED
{
+
if (return_value_used)
{
long flags = 0;
zval *allowed_extras_array = NULL, *data, **headers;
long flags = 0;
zval *allowed_extras_array = NULL, *data, **headers;
@@
-1787,7
+1787,7
@@
PHP_METHOD(HttpRequest, getResponseBody)
{
NO_ARGS;
{
NO_ARGS;
-
IF_RETVAL_USED
{
+
if (return_value_used)
{
zval **body;
zval *data = GET_PROP(responseData);
zval **body;
zval *data = GET_PROP(responseData);
@@
-1814,7
+1814,7
@@
PHP_METHOD(HttpRequest, getResponseCode)
{
NO_ARGS;
{
NO_ARGS;
-
IF_RETVAL_USED
{
+
if (return_value_used)
{
RETURN_PROP(responseCode);
}
}
RETURN_PROP(responseCode);
}
}
@@
-1830,7
+1830,7
@@
PHP_METHOD(HttpRequest, getResponseStatus)
{
NO_ARGS;
{
NO_ARGS;
-
IF_RETVAL_USED
{
+
if (return_value_used)
{
RETURN_PROP(responseStatus);
}
}
RETURN_PROP(responseStatus);
}
}
@@
-1854,7
+1854,7
@@
PHP_METHOD(HttpRequest, getResponseStatus)
*/
PHP_METHOD(HttpRequest, getResponseInfo)
{
*/
PHP_METHOD(HttpRequest, getResponseInfo)
{
-
IF_RETVAL_USED
{
+
if (return_value_used)
{
zval *info, **infop;
char *info_name = NULL;
int info_len = 0;
zval *info, **infop;
char *info_name = NULL;
int info_len = 0;
@@
-1935,7
+1935,7
@@
PHP_METHOD(HttpRequest, getRequestMessage)
{
NO_ARGS;
{
NO_ARGS;
-
IF_RETVAL_USED
{
+
if (return_value_used)
{
http_message *msg;
getObject(http_request_object, obj);
http_message *msg;
getObject(http_request_object, obj);
@@
-1958,7
+1958,7
@@
PHP_METHOD(HttpRequest, getRawRequestMessage)
{
NO_ARGS;
{
NO_ARGS;
-
IF_RETVAL_USED
{
+
if (return_value_used)
{
getObject(http_request_object, obj);
RETURN_PHPSTR_DUP(&obj->request->conv.request);
getObject(http_request_object, obj);
RETURN_PHPSTR_DUP(&obj->request->conv.request);
@@
-1976,7
+1976,7
@@
PHP_METHOD(HttpRequest, getRawResponseMessage)
{
NO_ARGS;
{
NO_ARGS;
-
IF_RETVAL_USED
{
+
if (return_value_used)
{
getObject(http_request_object, obj);
RETURN_PHPSTR_DUP(&obj->request->conv.response);
getObject(http_request_object, obj);
RETURN_PHPSTR_DUP(&obj->request->conv.response);
@@
-2003,7
+2003,7
@@
PHP_METHOD(HttpRequest, getHistory)
{
NO_ARGS;
{
NO_ARGS;
-
IF_RETVAL_USED
{
+
if (return_value_used)
{
zval *hist;
SET_EH_THROW_HTTP();
zval *hist;
SET_EH_THROW_HTTP();