X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_request_object.c;h=e189c214ed1379aa7d97bcc4223ad33ec4e15251;hb=bee9b3775968701c021233bf8623c92c1dc7e7b5;hp=facd8e974e5fbd27f02efac7f9559adc38fb02f6;hpb=bf87f6e654235acb023ca052a5e71faeb2635a3f;p=m6w6%2Fext-http diff --git a/http_request_object.c b/http_request_object.c index facd8e9..e189c21 100644 --- a/http_request_object.c +++ b/http_request_object.c @@ -147,11 +147,13 @@ HTTP_BEGIN_ARGS(getResponseInfo, 0, 0) HTTP_ARG_VAL(name, 0) HTTP_END_ARGS; -HTTP_EMPTY_ARGS(getResponseMessage, 1); -HTTP_EMPTY_ARGS(getRequestMessage, 1); -HTTP_EMPTY_ARGS(getHistory, 1); +HTTP_EMPTY_ARGS(getResponseMessage, 0); +HTTP_EMPTY_ARGS(getRawResponseMessage, 0); +HTTP_EMPTY_ARGS(getRequestMessage, 0); +HTTP_EMPTY_ARGS(getRawRequestMessage, 0); +HTTP_EMPTY_ARGS(getHistory, 0); HTTP_EMPTY_ARGS(clearHistory, 0); -HTTP_EMPTY_ARGS(send, 1); +HTTP_EMPTY_ARGS(send, 0); HTTP_BEGIN_ARGS(get, 0, 1) HTTP_ARG_VAL(url, 0) @@ -267,7 +269,9 @@ zend_function_entry http_request_object_fe[] = { HTTP_REQUEST_ME(getResponseBody, ZEND_ACC_PUBLIC) HTTP_REQUEST_ME(getResponseInfo, ZEND_ACC_PUBLIC) HTTP_REQUEST_ME(getResponseMessage, ZEND_ACC_PUBLIC) + HTTP_REQUEST_ME(getRawResponseMessage, ZEND_ACC_PUBLIC) HTTP_REQUEST_ME(getRequestMessage, ZEND_ACC_PUBLIC) + HTTP_REQUEST_ME(getRawRequestMessage, ZEND_ACC_PUBLIC) HTTP_REQUEST_ME(getHistory, ZEND_ACC_PUBLIC) HTTP_REQUEST_ME(clearHistory, ZEND_ACC_PUBLIC) @@ -1875,6 +1879,44 @@ PHP_METHOD(HttpRequest, getRequestMessage) } /* }}} */ +/* {{{ proto string HttpRequest::getRawRequestMessage() + * + * Get sent HTTP message. + * + * Returns an HttpMessage in a form of a string + * + */ +PHP_METHOD(HttpRequest, getRawRequestMessage) +{ + NO_ARGS; + + IF_RETVAL_USED { + getObject(http_request_object, obj); + + RETURN_PHPSTR_DUP(&obj->request->conv.request); + } +} +/* }}} */ + +/* {{{ proto string HttpRequest::getRawResponseMessage() + * + * Get the entire HTTP response. + * + * Returns the complete web server response, including the headers in a form of a string. + * + */ +PHP_METHOD(HttpRequest, getRawResponseMessage) +{ + NO_ARGS; + + IF_RETVAL_USED { + getObject(http_request_object, obj); + + RETURN_PHPSTR_DUP(&obj->request->conv.response); + } +} +/* }}} */ + /* {{{ proto HttpMessage HttpRequest::getHistory() * * Get all sent requests and received responses as an HttpMessage object.