#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
-
#include "php.h"
+#ifdef ZEND_ENGINE_2
+
#include "php_http.h"
#include "php_http_std_defs.h"
#include "php_http_message_object.h"
-#ifdef ZEND_ENGINE_2
+#include "phpstr/phpstr.h"
+
+#define HTTP_BEGIN_ARGS(method, req_args) HTTP_BEGIN_ARGS_EX(HttpMessage, method, ZEND_RETURN_REFERENCE_AGNOSTIC, req_args)
+#define HTTP_EMPTY_ARGS(method, ret_ref) HTTP_EMPTY_ARGS_EX(HttpMessage, method, ret_ref)
+#define HTTP_MESSAGE_ME(method, visibility) PHP_ME(HttpMessage, method, HTTP_ARGS(HttpMessage, method), visibility)
+
+HTTP_BEGIN_ARGS(__construct, 0)
+ HTTP_ARG_VAL(message, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(fromString, 1)
+ HTTP_ARG_VAL(message, 0)
+HTTP_END_ARGS;
+
+HTTP_EMPTY_ARGS(getBody, 0);
+HTTP_EMPTY_ARGS(getHeaders, 0);
+HTTP_BEGIN_ARGS(setHeaders, 1)
+ HTTP_ARG_VAL(headers, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(addHeaders, 1)
+ HTTP_ARG_VAL(headers, 0)
+ HTTP_ARG_VAL(append, 0)
+HTTP_END_ARGS;
+
+HTTP_EMPTY_ARGS(getType, 0);
+HTTP_BEGIN_ARGS(setType, 1)
+ HTTP_ARG_VAL(type, 0)
+HTTP_END_ARGS;
+
+HTTP_EMPTY_ARGS(getResponseCode, 0);
+HTTP_BEGIN_ARGS(setResponseCode, 1)
+ HTTP_ARG_VAL(response_code, 0)
+HTTP_END_ARGS;
+
+HTTP_EMPTY_ARGS(getRequestMethod, 0);
+HTTP_BEGIN_ARGS(setRequestMethod, 1)
+ HTTP_ARG_VAL(request_method, 0)
+HTTP_END_ARGS;
+
+HTTP_EMPTY_ARGS(getRequestUri, 0);
+HTTP_BEGIN_ARGS(setRequestUri, 1)
+ HTTP_ARG_VAL(uri, 0)
+HTTP_END_ARGS;
+
+HTTP_EMPTY_ARGS(getHttpVersion, 0);
+HTTP_BEGIN_ARGS(setHttpVersion, 1)
+ HTTP_ARG_VAL(http_version, 0)
+HTTP_END_ARGS;
+
+HTTP_EMPTY_ARGS(getParentMessage, 1);
+HTTP_EMPTY_ARGS(send, 0);
+HTTP_BEGIN_ARGS(toString, 0)
+ HTTP_ARG_VAL(include_parent, 0)
+HTTP_END_ARGS;
#define http_message_object_declare_default_properties() _http_message_object_declare_default_properties(TSRMLS_C)
static inline void _http_message_object_declare_default_properties(TSRMLS_D);
static void _http_message_object_write_prop(zval *object, zval *member, zval *value TSRMLS_DC);
#define http_message_object_get_props _http_message_object_get_props
static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC);
+#define http_message_object_clone_obj _http_message_object_clone_obj
+static inline zend_object_value _http_message_object_clone_obj(zval *object TSRMLS_DC);
zend_class_entry *http_message_object_ce;
zend_function_entry http_message_object_fe[] = {
- PHP_ME(HttpMessage, getBody, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpMessage, getHeaders, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpMessage, setHeaders, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpMessage, addHeaders, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpMessage, getType, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpMessage, setType, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpMessage, getResponseCode, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpMessage, setResponseCode, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpMessage, getRequestMethod, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpMessage, setRequestMethod, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpMessage, getRequestUri, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpMessage, setRequestUri, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpMessage, getHttpVersion, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpMessage, setHttpVersion, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpMessage, getNestedMessage, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpMessage, toString, NULL, ZEND_ACC_PUBLIC)
-
- ZEND_MALIAS(HttpMessage, __toString, toString, NULL, ZEND_ACC_PUBLIC)
-
- PHP_ME(HttpMessage, fromString, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+ HTTP_MESSAGE_ME(__construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+ HTTP_MESSAGE_ME(getBody, 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(getType, ZEND_ACC_PUBLIC)
+ HTTP_MESSAGE_ME(setType, ZEND_ACC_PUBLIC)
+ HTTP_MESSAGE_ME(getResponseCode, ZEND_ACC_PUBLIC)
+ HTTP_MESSAGE_ME(setResponseCode, ZEND_ACC_PUBLIC)
+ HTTP_MESSAGE_ME(getRequestMethod, ZEND_ACC_PUBLIC)
+ HTTP_MESSAGE_ME(setRequestMethod, ZEND_ACC_PUBLIC)
+ HTTP_MESSAGE_ME(getRequestUri, ZEND_ACC_PUBLIC)
+ HTTP_MESSAGE_ME(setRequestUri, ZEND_ACC_PUBLIC)
+ HTTP_MESSAGE_ME(getHttpVersion, ZEND_ACC_PUBLIC)
+ HTTP_MESSAGE_ME(setHttpVersion, ZEND_ACC_PUBLIC)
+ HTTP_MESSAGE_ME(getParentMessage, ZEND_ACC_PUBLIC)
+ HTTP_MESSAGE_ME(send, ZEND_ACC_PUBLIC)
+ HTTP_MESSAGE_ME(toString, ZEND_ACC_PUBLIC)
+
+ ZEND_MALIAS(HttpMessage, __toString, toString, HTTP_ARGS(HttpMessage, toString), ZEND_ACC_PUBLIC)
+
+ HTTP_MESSAGE_ME(fromString, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
{NULL, NULL, NULL}
};
static zend_object_handlers http_message_object_handlers;
HTTP_LONG_CONSTANT("HTTP_MSG_REQUEST", HTTP_MSG_REQUEST);
HTTP_LONG_CONSTANT("HTTP_MSG_RESPONSE", HTTP_MSG_RESPONSE);
+ http_message_object_handlers.clone_obj = http_message_object_clone_obj;
http_message_object_handlers.read_property = http_message_object_read_prop;
http_message_object_handlers.write_property = http_message_object_write_prop;
http_message_object_handlers.get_properties = http_message_object_get_props;
o = ecalloc(1, sizeof(http_message_object));
o->zo.ce = ce;
o->message = NULL;
+ o->parent.handle = 0;
+ o->parent.handlers = NULL;
if (msg) {
o->message = msg;
- if (msg->nested) {
- o->nested = http_message_object_from_msg(msg->nested);
+ if (msg->parent) {
+ o->parent = http_message_object_from_msg(msg->parent);
}
}
return ov;
}
+zend_object_value _http_message_object_clone(zval *this_ptr TSRMLS_DC)
+{
+ return http_message_object_clone_obj(this_ptr TSRMLS_CC);
+}
+
static inline void _http_message_object_declare_default_properties(TSRMLS_D)
{
zend_class_entry *ce = http_message_object_ce;
DCL_PROP(PROTECTED, long, responseCode, 0);
DCL_PROP_N(PROTECTED, httpVersion);
DCL_PROP_N(PROTECTED, headers);
-
- DCL_PROP_N(PUBLIC, nestedMessage);
+ DCL_PROP_N(PROTECTED, parentMessage);
}
-static void _http_message_object_free(zend_object *object TSRMLS_DC)
+void _http_message_object_free(zend_object *object TSRMLS_DC)
{
http_message_object *o = (http_message_object *) object;
efree(o);
}
+static inline zend_object_value _http_message_object_clone_obj(zval *this_ptr TSRMLS_DC)
+{
+ getObject(http_message_object, obj);
+ return http_message_object_from_msg(http_message_dup(obj->message));
+}
+
static zval *_http_message_object_read_prop(zval *object, zval *member, int type TSRMLS_DC)
{
getObjectEx(http_message_object, obj, object);
return EG(uninitialized_zval_ptr);
}
- zval_dtor(return_value);
-
-#if 0
- fprintf(stderr, "Reading property: %s(%d==%d) (%lu)\n", Z_STRVAL_P(member), Z_STRLEN_P(member), strlen(Z_STRVAL_P(member)),
- zend_get_hash_value(Z_STRVAL_P(member), strlen(Z_STRVAL_P(member)) + 1)
- );
-#endif
-
- switch (zend_get_hash_value(Z_STRVAL_P(member), strlen(Z_STRVAL_P(member)) + 1))
+ switch (zend_get_hash_value(Z_STRVAL_P(member), Z_STRLEN_P(member) + 1))
{
case HTTP_MSG_PROPHASH_TYPE:
RETVAL_LONG(msg->type);
case HTTP_MSG_PROPHASH_HTTP_VERSION:
switch (msg->type)
{
- case HTTP_MSG_NONE:
- RETVAL_NULL();
- break;
-
case HTTP_MSG_REQUEST:
RETVAL_DOUBLE(msg->info.request.http_version);
break;
case HTTP_MSG_RESPONSE:
RETVAL_DOUBLE(msg->info.response.http_version);
break;
+
+ case HTTP_MSG_NONE:
+ default:
+ RETVAL_NULL();
+ break;
}
break;
zend_hash_copy(Z_ARRVAL_P(return_value), &msg->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
break;
- case HTTP_MSG_PROPHASH_NESTED_MESSAGE:
- if (msg->nested) {
+ case HTTP_MSG_PROPHASH_PARENT_MESSAGE:
+ if (msg->parent) {
+ RETVAL_OBJVAL(obj->parent);
Z_TYPE_P(return_value) = IS_OBJECT;
- return_value->value.obj = obj->nested;
+ return_value->value.obj = obj->parent;
zend_objects_store_add_ref(return_value TSRMLS_CC);
} else {
RETVAL_NULL();
break;
case HTTP_MSG_PROPHASH_REQUEST_METHOD:
- if (msg->type == HTTP_MSG_REQUEST && msg->info.request.method) {
+ if (HTTP_MSG_TYPE(REQUEST, msg) && msg->info.request.method) {
RETVAL_STRING(msg->info.request.method, 1);
} else {
RETVAL_NULL();
break;
case HTTP_MSG_PROPHASH_REQUEST_URI:
- if (msg->type == HTTP_MSG_REQUEST && msg->info.request.URI) {
+ if (HTTP_MSG_TYPE(REQUEST, msg) && msg->info.request.URI) {
RETVAL_STRING(msg->info.request.URI, 1);
} else {
RETVAL_NULL();
break;
case HTTP_MSG_PROPHASH_RESPONSE_CODE:
- if (msg->type == HTTP_MSG_RESPONSE) {
+ if (HTTP_MSG_TYPE(RESPONSE, msg)) {
RETVAL_LONG(msg->info.response.code);
} else {
RETVAL_NULL();
zend_error(E_WARNING, "Cannot access protected property %s::$%s", obj->zo.ce->name, Z_STRVAL_P(member));
}
-#if 0
- fprintf(stderr, "Writing property: %s(%d==%d) (%lu)\n", Z_STRVAL_P(member), Z_STRLEN_P(member), strlen(Z_STRVAL_P(member)),
- zend_get_hash_value(Z_STRVAL_P(member), strlen(Z_STRVAL_P(member)) + 1)
- );
-#endif
-
- switch (zend_get_hash_value(Z_STRVAL_P(member), strlen(Z_STRVAL_P(member)) + 1))
+ switch (zend_get_hash_value(Z_STRVAL_P(member), Z_STRLEN_P(member) + 1))
{
case HTTP_MSG_PROPHASH_TYPE:
+ convert_to_long_ex(&value);
if (Z_LVAL_P(value) != msg->type) {
- if (msg->type == HTTP_MSG_REQUEST) {
+ if (HTTP_MSG_TYPE(REQUEST, msg)) {
if (msg->info.request.method) {
efree(msg->info.request.method);
}
}
}
msg->type = Z_LVAL_P(value);
- if (msg->type == HTTP_MSG_REQUEST) {
+ if (HTTP_MSG_TYPE(REQUEST, msg)) {
msg->info.request.method = NULL;
msg->info.request.URI = NULL;
}
break;
case HTTP_MSG_PROPHASH_HTTP_VERSION:
+ convert_to_double_ex(&value);
switch (msg->type)
{
case HTTP_MSG_REQUEST:
- msg->info.request.http_version = (float) Z_DVAL_P(value);
+ msg->info.request.http_version = Z_DVAL_P(value);
break;
case HTTP_MSG_RESPONSE:
- msg->info.response.http_version = (float) Z_DVAL_P(value);
+ msg->info.response.http_version = Z_DVAL_P(value);
break;
}
break;
case HTTP_MSG_PROPHASH_BODY:
+ convert_to_string_ex(&value);
phpstr_dtor(PHPSTR(msg));
phpstr_from_string_ex(PHPSTR(msg), Z_STRVAL_P(value), Z_STRLEN_P(value));
break;
case HTTP_MSG_PROPHASH_HEADERS:
+ convert_to_array_ex(&value);
zend_hash_clean(&msg->hdrs);
zend_hash_copy(&msg->hdrs, Z_ARRVAL_P(value), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
break;
- case HTTP_MSG_PROPHASH_NESTED_MESSAGE:
- if (msg->nested) {
+ case HTTP_MSG_PROPHASH_PARENT_MESSAGE:
+ if (msg->parent) {
zval tmp;
- tmp.value.obj = obj->nested;
+ tmp.value.obj = obj->parent;
zend_objects_store_del_ref(&tmp TSRMLS_CC);
}
zend_objects_store_add_ref(value TSRMLS_CC);
- obj->nested = value->value.obj;
+ obj->parent = value->value.obj;
break;
case HTTP_MSG_PROPHASH_REQUEST_METHOD:
- if (msg->type == HTTP_MSG_REQUEST) {
+ convert_to_string_ex(&value);
+ if (HTTP_MSG_TYPE(REQUEST, msg)) {
if (msg->info.request.method) {
efree(msg->info.request.method);
}
break;
case HTTP_MSG_PROPHASH_REQUEST_URI:
- if (msg->type == HTTP_MSG_REQUEST) {
+ convert_to_string_ex(&value);
+ if (HTTP_MSG_TYPE(REQUEST, msg)) {
if (msg->info.request.URI) {
efree(msg->info.request.URI);
}
break;
case HTTP_MSG_PROPHASH_RESPONSE_CODE:
- if (msg->type == HTTP_MSG_RESPONSE) {
+ convert_to_long_ex(&value);
+ if (HTTP_MSG_TYPE(RESPONSE, msg)) {
msg->info.response.code = Z_LVAL_P(value);
}
break;
projects / m6w6 / ext-http / blobdiff