#define HTTP_WANT_SAPI
#define HTTP_WANT_CURL
+#define HTTP_WANT_MAGIC
#include "php_http.h"
#ifdef ZEND_ENGINE_2
#include "php_http_request_api.h"
#include "php_http_request_object.h"
-#ifndef WONKY
-# ifdef HAVE_SPL
+#if defined(HTTP_HAVE_SPL) && !defined(WONKY)
/* SPL doesn't install its headers */
extern PHPAPI zend_class_entry *spl_ce_Countable;
-# endif
#endif
#define HTTP_BEGIN_ARGS(method, req_args) HTTP_BEGIN_ARGS_EX(HttpMessage, method, 0, req_args)
HTTP_ARG_VAL(body, 0)
HTTP_END_ARGS;
+HTTP_BEGIN_ARGS(getHeader, 1)
+ HTTP_ARG_VAL(header, 0)
+HTTP_END_ARGS;
+
HTTP_EMPTY_ARGS(getHeaders);
HTTP_BEGIN_ARGS(setHeaders, 1)
HTTP_ARG_VAL(headers, 0)
HTTP_ARG_VAL(http_version, 0)
HTTP_END_ARGS;
+HTTP_BEGIN_ARGS(guessContentType, 1)
+ HTTP_ARG_VAL(magic_file, 0)
+ HTTP_ARG_VAL(magic_mode, 0)
+HTTP_END_ARGS;
+
HTTP_EMPTY_ARGS(getParentMessage);
HTTP_EMPTY_ARGS(send);
HTTP_BEGIN_ARGS(toString, 0)
HTTP_MESSAGE_ME(__construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
HTTP_MESSAGE_ME(getBody, ZEND_ACC_PUBLIC)
HTTP_MESSAGE_ME(setBody, ZEND_ACC_PUBLIC)
+ HTTP_MESSAGE_ME(getHeader, ZEND_ACC_PUBLIC)
HTTP_MESSAGE_ME(getHeaders, ZEND_ACC_PUBLIC)
HTTP_MESSAGE_ME(setHeaders, ZEND_ACC_PUBLIC)
HTTP_MESSAGE_ME(addHeaders, ZEND_ACC_PUBLIC)
HTTP_MESSAGE_ME(setRequestUrl, ZEND_ACC_PUBLIC)
HTTP_MESSAGE_ME(getHttpVersion, ZEND_ACC_PUBLIC)
HTTP_MESSAGE_ME(setHttpVersion, ZEND_ACC_PUBLIC)
+ HTTP_MESSAGE_ME(guessContentType, ZEND_ACC_PUBLIC)
HTTP_MESSAGE_ME(getParentMessage, ZEND_ACC_PUBLIC)
HTTP_MESSAGE_ME(send, ZEND_ACC_PUBLIC)
HTTP_MESSAGE_ME(toString, ZEND_ACC_PUBLIC)
HTTP_REGISTER_CLASS_EX(HttpMessage, http_message_object, NULL, 0);
#ifndef WONKY
-# ifdef HAVE_SPL
+# ifdef HTTP_HAVE_SPL
zend_class_implements(http_message_object_ce TSRMLS_CC, 3, spl_ce_Countable, zend_ce_serializable, zend_ce_iterator);
# else
zend_class_implements(http_message_object_ce TSRMLS_CC, 2, zend_ce_serializable, zend_ce_iterator);
}
ALLOC_HASHTABLE(OBJ_PROP(o));
- zend_hash_init(OBJ_PROP(o), 0, NULL, ZVAL_PTR_DTOR, 0);
+ zend_hash_init(OBJ_PROP(o), zend_hash_num_elements(&ce->default_properties), NULL, ZVAL_PTR_DTOR, 0);
+ zend_hash_copy(OBJ_PROP(o), &ce->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
ov.handle = putObject(http_message_object, o);
ov.handlers = &http_message_object_handlers;
zend_object_value _http_message_object_clone_obj(zval *this_ptr TSRMLS_DC)
{
- getObject(http_message_object, obj);
- return http_message_object_new_ex(Z_OBJCE_P(this_ptr), http_message_dup(obj->message), NULL);
+ zend_object_value new_ov;
+ http_message_object *new_obj = NULL;
+ getObject(http_message_object, old_obj);
+
+ new_ov = http_message_object_new_ex(old_obj->zo.ce, http_message_dup(old_obj->message), &new_obj);
+ zend_objects_clone_members(&new_obj->zo, new_ov, &old_obj->zo, Z_OBJ_HANDLE_P(this_ptr) TSRMLS_CC);
+
+ return new_ov;
}
void _http_message_object_free(zend_object *object TSRMLS_DC)
{
http_message_object *o = (http_message_object *) object;
- if (OBJ_PROP(o)) {
- zend_hash_destroy(OBJ_PROP(o));
- FREE_HASHTABLE(OBJ_PROP(o));
- }
if (o->message) {
http_message_dtor(o->message);
efree(o->message);
p.value.obj = o->parent;
zend_objects_store_del_ref(&p TSRMLS_CC);
}
- efree(o);
+ freeObject(o);
}
static zval *_http_message_object_read_prop(zval *object, zval *member, int type TSRMLS_DC)
case HTTP_MSG_PROPHASH_TYPE:
case HTTP_MSG_CHILD_PROPHASH_TYPE:
RETVAL_LONG(msg->type);
- break;
+ break;
case HTTP_MSG_PROPHASH_HTTP_VERSION:
case HTTP_MSG_CHILD_PROPHASH_HTTP_VERSION:
RETVAL_DOUBLE(msg->http.version);
- break;
+ break;
case HTTP_MSG_PROPHASH_BODY:
case HTTP_MSG_CHILD_PROPHASH_BODY:
phpstr_fix(PHPSTR(msg));
RETVAL_PHPSTR(PHPSTR(msg), 0, 1);
- break;
+ break;
case HTTP_MSG_PROPHASH_HEADERS:
case HTTP_MSG_CHILD_PROPHASH_HEADERS:
array_init(return_value);
zend_hash_copy(Z_ARRVAL_P(return_value), &msg->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
- break;
+ break;
case HTTP_MSG_PROPHASH_PARENT_MESSAGE:
case HTTP_MSG_CHILD_PROPHASH_PARENT_MESSAGE:
} else {
RETVAL_NULL();
}
- break;
+ break;
case HTTP_MSG_PROPHASH_REQUEST_METHOD:
case HTTP_MSG_CHILD_PROPHASH_REQUEST_METHOD:
} else {
RETVAL_NULL();
}
- break;
+ break;
case HTTP_MSG_PROPHASH_REQUEST_URL:
case HTTP_MSG_CHILD_PROPHASH_REQUEST_URL:
} else {
RETVAL_NULL();
}
- break;
+ break;
case HTTP_MSG_PROPHASH_RESPONSE_CODE:
case HTTP_MSG_CHILD_PROPHASH_RESPONSE_CODE:
} else {
RETVAL_NULL();
}
- break;
+ break;
case HTTP_MSG_PROPHASH_RESPONSE_STATUS:
case HTTP_MSG_CHILD_PROPHASH_RESPONSE_STATUS:
} else {
RETVAL_NULL();
}
- break;
+ break;
default:
#ifdef WONKY
#else
RETVAL_NULL();
#endif
- break;
}
return return_value;
case HTTP_MSG_CHILD_PROPHASH_TYPE:
convert_to_long(cpy);
http_message_set_type(msg, Z_LVAL_P(cpy));
- break;
+ break;
case HTTP_MSG_PROPHASH_HTTP_VERSION:
case HTTP_MSG_CHILD_PROPHASH_HTTP_VERSION:
convert_to_double(cpy);
msg->http.version = Z_DVAL_P(cpy);
- break;
+ break;
case HTTP_MSG_PROPHASH_BODY:
case HTTP_MSG_CHILD_PROPHASH_BODY:
convert_to_string(cpy);
phpstr_dtor(PHPSTR(msg));
phpstr_from_string_ex(PHPSTR(msg), Z_STRVAL_P(cpy), Z_STRLEN_P(cpy));
- break;
+ break;
case HTTP_MSG_PROPHASH_HEADERS:
case HTTP_MSG_CHILD_PROPHASH_HEADERS:
convert_to_array(cpy);
zend_hash_clean(&msg->hdrs);
zend_hash_copy(&msg->hdrs, Z_ARRVAL_P(cpy), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
- break;
+ break;
case HTTP_MSG_PROPHASH_PARENT_MESSAGE:
case HTTP_MSG_CHILD_PROPHASH_PARENT_MESSAGE:
Z_OBJ_ADDREF_P(value);
obj->parent = value->value.obj;
}
- break;
+ break;
case HTTP_MSG_PROPHASH_REQUEST_METHOD:
case HTTP_MSG_CHILD_PROPHASH_REQUEST_METHOD:
convert_to_string(cpy);
STR_SET(msg->http.info.request.method, estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy)));
}
- break;
+ break;
case HTTP_MSG_PROPHASH_REQUEST_URL:
case HTTP_MSG_CHILD_PROPHASH_REQUEST_URL:
convert_to_string(cpy);
STR_SET(msg->http.info.request.url, estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy)));
}
- break;
+ break;
case HTTP_MSG_PROPHASH_RESPONSE_CODE:
case HTTP_MSG_CHILD_PROPHASH_RESPONSE_CODE:
convert_to_long(cpy);
msg->http.info.response.code = Z_LVAL_P(cpy);
}
- break;
+ break;
case HTTP_MSG_PROPHASH_RESPONSE_STATUS:
case HTTP_MSG_CHILD_PROPHASH_RESPONSE_STATUS:
convert_to_string(cpy);
STR_SET(msg->http.info.response.status, estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy)));
}
- break;
+ break;
default:
#ifdef WONKY
zend_get_std_object_handlers()->write_property(object, member, value TSRMLS_CC);
#endif
- break;
+ break;
}
zval_free(&cpy);
}
ASSOC_PROP(array, long, "type", msg->type);
ASSOC_PROP(array, double, "httpVersion", msg->http.version);
- switch (msg->type)
- {
+ switch (msg->type) {
case HTTP_MSG_REQUEST:
ASSOC_PROP(array, long, "responseCode", 0);
ASSOC_STRINGL(array, "responseStatus", "", 0);
- ASSOC_STRING(array, "requestMethod", msg->http.info.request.method);
- ASSOC_STRING(array, "requestUrl", msg->http.info.request.url);
- break;
+ ASSOC_STRING(array, "requestMethod", STR_PTR(msg->http.info.request.method));
+ ASSOC_STRING(array, "requestUrl", STR_PTR(msg->http.info.request.url));
+ break;
case HTTP_MSG_RESPONSE:
ASSOC_PROP(array, long, "responseCode", msg->http.info.response.code);
- ASSOC_STRING(array, "responseStatus", msg->http.info.response.status);
+ ASSOC_STRING(array, "responseStatus", STR_PTR(msg->http.info.response.status));
ASSOC_STRINGL(array, "requestMethod", "", 0);
ASSOC_STRINGL(array, "requestUrl", "", 0);
- break;
+ break;
case HTTP_MSG_NONE:
default:
ASSOC_STRINGL(array, "responseStatus", "", 0);
ASSOC_STRINGL(array, "requestMethod", "", 0);
ASSOC_STRINGL(array, "requestUrl", "", 0);
- break;
+ break;
}
MAKE_STD_ZVAL(headers);
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
getObject(http_message_object, obj);
RETURN_PHPSTR(&obj->message->body, PHPSTR_FREE_NOT, 1);
}
}
/* }}} */
+/* {{{ proto string HttpMessage::getHeader(string header)
+ *
+ * Get message header.
+ *
+ * Returns the header value on success or NULL if the header does not exist.
+ */
+PHP_METHOD(HttpMessage, getHeader)
+{
+ zval *header;
+ char *orig_header, *nice_header;
+ int header_len;
+ getObject(http_message_object, obj);
+
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &orig_header, &header_len)) {
+ RETURN_FALSE;
+ }
+
+ nice_header = pretty_key(estrndup(orig_header, header_len), header_len, 1, 1);
+ if ((header = http_message_header_ex(obj->message, nice_header, header_len + 1, 0))) {
+ RETVAL_ZVAL(header, 1, 1);
+ }
+ efree(nice_header);
+}
+/* }}} */
+
/* {{{ proto array HttpMessage::getHeaders()
*
* Get Message Headers.
{
NO_ARGS;
- IF_RETVAL_USED {
- zval headers;
+ if (return_value_used) {
getObject(http_message_object, obj);
- INIT_ZARR(headers, &obj->message->hdrs);
array_init(return_value);
- array_copy(&headers, return_value);
+ array_copy(&obj->message->hdrs, Z_ARRVAL_P(return_value));
}
}
/* }}} */
*/
PHP_METHOD(HttpMessage, setHeaders)
{
- zval *new_headers, old_headers;
+ zval *new_headers = NULL;
getObject(http_message_object, obj);
- if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/", &new_headers)) {
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/!", &new_headers)) {
return;
}
zend_hash_clean(&obj->message->hdrs);
- INIT_ZARR(old_headers, &obj->message->hdrs);
- array_copy(new_headers, &old_headers);
+ if (new_headers) {
+ array_copy(Z_ARRVAL_P(new_headers), &obj->message->hdrs);
+ }
}
/* }}} */
*/
PHP_METHOD(HttpMessage, addHeaders)
{
- zval old_headers, *new_headers;
+ zval *new_headers;
zend_bool append = 0;
getObject(http_message_object, obj);
return;
}
- INIT_ZARR(old_headers, &obj->message->hdrs);
- if (append) {
- array_append(new_headers, &old_headers);
- } else {
- array_merge(new_headers, &old_headers);
- }
+ array_join(Z_ARRVAL_P(new_headers), &obj->message->hdrs, append, ARRAY_JOIN_STRONLY|ARRAY_JOIN_PRETTIFY);
}
/* }}} */
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
getObject(http_message_object, obj);
RETURN_LONG(obj->message->type);
}
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
getObject(http_message_object, obj);
HTTP_CHECK_MESSAGE_TYPE_RESPONSE(obj->message, RETURN_FALSE);
RETURN_LONG(obj->message->http.info.response.code);
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
getObject(http_message_object, obj);
HTTP_CHECK_MESSAGE_TYPE_RESPONSE(obj->message, RETURN_FALSE);
RETURN_STRING(obj->message->http.info.response.status, 1);
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
getObject(http_message_object, obj);
HTTP_CHECK_MESSAGE_TYPE_REQUEST(obj->message, RETURN_FALSE);
RETURN_STRING(obj->message->http.info.request.method, 1);
http_error(HE_WARNING, HTTP_E_INVALID_PARAM, "Cannot set HttpMessage::requestMethod to an empty string");
RETURN_FALSE;
}
- if (SUCCESS != http_check_method(method)) {
- http_error_ex(HE_WARNING, HTTP_E_REQUEST_METHOD, "Unkown request method: %s", method);
+ if (!http_request_method_exists(1, 0, method)) {
+ http_error_ex(HE_WARNING, HTTP_E_REQUEST_METHOD, "Unknown request method: %s", method);
RETURN_FALSE;
}
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
getObject(http_message_object, obj);
HTTP_CHECK_MESSAGE_TYPE_REQUEST(obj->message, RETURN_FALSE);
RETURN_STRING(obj->message->http.info.request.url, 1);
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
char ver[4] = {0};
getObject(http_message_object, obj);
}
/* }}} */
+/* {{{ proto string HttpMessage::guessContentType(string magic_file[, int magic_mode = MAGIC_MIME])
+ *
+ * Attempts to guess the content type of supplied payload through libmagic.
+ *
+ * Expects a string parameter specifying the magic.mime database to use.
+ * Additionally accepts an optional int parameter, being flags for libmagic.
+ *
+ * Returns the guessed content type on success, or FALSE on failure.
+ *
+ * Throws HttpRuntimeException, HttpInvalidParamException
+ * if http.only_exceptions is TRUE.
+ */
+PHP_METHOD(HttpMessage, guessContentType)
+{
+#ifdef HTTP_HAVE_MAGIC
+ char *magic_file, *ct = NULL;
+ int magic_file_len;
+ long magic_mode = MAGIC_MIME;
+
+ RETVAL_FALSE;
+ SET_EH_THROW_HTTP();
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &magic_file, &magic_file_len, &magic_mode)) {
+ getObject(http_message_object, obj);
+ if ((ct = http_guess_content_type(magic_file, magic_mode, PHPSTR_VAL(&obj->message->body), PHPSTR_LEN(&obj->message->body), SEND_DATA))) {
+ RETVAL_STRING(ct, 0);
+ }
+ }
+ SET_EH_NORMAL();
+#else
+ http_error(HE_THROW, HTTP_E_RUNTIME, "Cannot guess Content-Type; libmagic not available");
+ RETURN_FALSE;
+#endif
+}
+/* }}} */
+
/* {{{ proto HttpMessage HttpMessage::getParentMessage()
*
* Get parent Message.
- *
+ *
* Returns the parent HttpMessage on success, or NULL if there's none.
*
- * Throws HttpMessageException.
+ * Throws HttpRuntimeException.
*/
PHP_METHOD(HttpMessage, getParentMessage)
{
*/
PHP_METHOD(HttpMessage, toString)
{
- IF_RETVAL_USED {
+ if (return_value_used) {
char *string;
size_t length;
zend_bool include_parent = 0;
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
getObject(http_message_object, obj);
- switch (obj->message->type)
- {
+ switch (obj->message->type) {
case HTTP_MSG_REQUEST:
{
#ifdef HTTP_HAVE_CURL
int method;
char *url;
- zval tmp, body, *array, *headers, *host = http_message_header(obj->message, "Host");
+ zval body, *array, *headers, *host = http_message_header(obj->message, "Host");
php_url hurl, *purl = php_url_parse(obj->message->http.info.request.url);
MAKE_STD_ZVAL(array);
memset(&hurl, 0, sizeof(php_url));
hurl.host = host ? Z_STRVAL_P(host) : NULL;
+ zval_ptr_dtor(&host);
http_build_url(HTTP_URL_REPLACE, purl, &hurl, NULL, &url, NULL);
php_url_free(purl);
add_assoc_string(array, "url", url, 0);
MAKE_STD_ZVAL(headers);
array_init(headers);
- INIT_ZARR(tmp, &obj->message->hdrs);
- array_copy(&tmp, headers);
+ array_copy(&obj->message->hdrs, Z_ARRVAL_P(headers));
add_assoc_zval(array, "headers", headers);
object_init_ex(return_value, http_request_object_ce);
#else
http_error(HE_WARNING, HTTP_E_RUNTIME, "Cannot transform HttpMessage to HttpRequest (missing curl support)");
#endif
+ break;
}
- break;
case HTTP_MSG_RESPONSE:
{
#ifndef WONKY
HashPosition pos1, pos2;
- ulong idx;
- uint key_len;
- char *key = NULL;
+ HashKey key = initHashKey(0);
zval **header, **h, *body;
if (obj->message->http.info.response.code) {
object_init_ex(return_value, http_response_object_ce);
- FOREACH_HASH_KEYLENVAL(pos1, &obj->message->hdrs, key, key_len, idx, header) {
- if (key) {
- zval zkey;
+ FOREACH_HASH_KEYVAL(pos1, &obj->message->hdrs, key, header) {
+ if (key.type == HASH_KEY_IS_STRING) {
+ zval *zkey;
- INIT_PZVAL(&zkey);
- ZVAL_STRINGL(&zkey, key, key_len, 0);
+ MAKE_STD_ZVAL(zkey);
+ ZVAL_STRINGL(zkey, key.str, key.len - 1, 1);
- switch (Z_TYPE_PP(header))
- {
+ switch (Z_TYPE_PP(header)) {
case IS_ARRAY:
case IS_OBJECT:
FOREACH_HASH_VAL(pos2, HASH_OF(*header), h) {
ZVAL_ADDREF(*h);
- zend_call_method_with_2_params(&return_value, http_response_object_ce, NULL, "setheader", NULL, &zkey, *h);
+ zend_call_method_with_2_params(&return_value, http_response_object_ce, NULL, "setheader", NULL, zkey, *h);
zval_ptr_dtor(h);
}
- break;
+ break;
default:
ZVAL_ADDREF(*header);
- zend_call_method_with_2_params(&return_value, http_response_object_ce, NULL, "setheader", NULL, &zkey, *header);
+ zend_call_method_with_2_params(&return_value, http_response_object_ce, NULL, "setheader", NULL, zkey, *header);
zval_ptr_dtor(header);
- break;
+ break;
}
- key = NULL;
+ zval_ptr_dtor(&zkey);
}
}
#else
http_error(HE_WARNING, HTTP_E_RUNTIME, "Cannot transform HttpMessage to HttpResponse (need PHP 5.1+)");
#endif
+ break;
}
- break;
default:
http_error(HE_WARNING, HTTP_E_MESSAGE_TYPE, "HttpMessage is neither of type HttpMessage::TYPE_REQUEST nor HttpMessage::TYPE_RESPONSE");
- break;
+ break;
}
}
SET_EH_NORMAL();
}
/* }}} */
-/* {{{ proto void HttpMessage::prepend(HttpMessage message)
+/* {{{ proto void HttpMessage::prepend(HttpMessage message[, bool top = true])
*
* Prepends message(s) to the HTTP message.
*
* Expects an HttpMessage object as parameter.
+ *
+ * Throws HttpInvalidParamException if the message is located within the same message chain.
*/
PHP_METHOD(HttpMessage, prepend)
{
zend_bool top = 1;
if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|b", &prepend, http_message_object_ce, &top)) {
+ http_message *msg[2];
+ getObject(http_message_object, obj);
+ getObjectEx(http_message_object, prepend_obj, prepend);
+
+ /* safety check */
+ 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]) {
+ http_error(HE_THROW, HTTP_E_INVALID_PARAM, "Cannot prepend a message located within the same message chain");
+ return;
+ }
+ }
+ }
+
http_message_object_prepend_ex(getThis(), prepend, top);
}
}
projects / m6w6 / ext-http / blobdiff