#include "php.h"
+#include "php_http.h"
#include "php_http_std_defs.h"
#include "php_http_message_object.h"
zend_class_entry *http_message_object_ce;
zend_function_entry http_message_object_fe[] = {
- PHP_ME(HttpMessage, __construct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
- PHP_ME(HttpMessage, __destruct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_DTOR)
+ 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, 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)
{NULL, NULL, NULL}
};
static zend_object_handlers http_message_object_handlers;
{
HTTP_REGISTER_CLASS_EX(HttpMessage, http_message_object, NULL, 0);
+ HTTP_LONG_CONSTANT("HTTP_MSG_NONE", HTTP_MSG_NONE);
+ HTTP_LONG_CONSTANT("HTTP_MSG_REQUEST", HTTP_MSG_REQUEST);
+ HTTP_LONG_CONSTANT("HTTP_MSG_RESPONSE", HTTP_MSG_RESPONSE);
+
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;
}
zend_object_value _http_message_object_new(zend_class_entry *ce TSRMLS_DC)
+{
+ return http_message_object_new_ex(ce, NULL);
+}
+
+zend_object_value _http_message_object_new_ex(zend_class_entry *ce, http_message *msg TSRMLS_DC)
{
zend_object_value ov;
http_message_object *o;
o = ecalloc(1, sizeof(http_message_object));
o->zo.ce = ce;
- o->message = http_message_new();
+
+ MAKE_STD_ZVAL(o->nested);
+ Z_TYPE_P(o->nested) = IS_OBJECT;
+
+ if (msg) {
+ o->message = msg;
+ if (msg->nested) {
+ o->nested->value.obj = http_message_object_from_msg(msg->nested);
+ }
+ } else {
+ o->message = http_message_new();
+ }
ALLOC_HASHTABLE(OBJ_PROP(o));
zend_hash_init(OBJ_PROP(o), 0, NULL, ZVAL_PTR_DTOR, 0);
DCL_PROP(PROTECTED, long, type, HTTP_MSG_NONE);
- DCL_PROP(PROTECTED, string, raw, "");
DCL_PROP(PROTECTED, string, body, "");
DCL_PROP(PROTECTED, string, requestMethod, "");
DCL_PROP(PROTECTED, string, requestUri, "");
- DCL_PROP(PROTECTED, long, responseStatus, 0);
+ DCL_PROP(PROTECTED, long, responseCode, 0);
DCL_PROP_N(PROTECTED, httpVersion);
DCL_PROP_N(PROTECTED, headers);
- DCL_PROP_N(PROTECTED, nestedMessage);
+
+ DCL_PROP_N(PUBLIC, nestedMessage);
}
static void _http_message_object_free(zend_object *object TSRMLS_DC)
FREE_HASHTABLE(OBJ_PROP(o));
}
if (o->message) {
- http_message_free(o->message);
+ http_message_dtor(o->message);
+ efree(o->message);
}
+ FREE_ZVAL(o->nested);
+ zval_dtor(&o->_tmp_property);
efree(o);
}
{
getObjectEx(http_message_object, obj, object);
http_message *msg = obj->message;
- zval *return_value;
-
- if (!EG(scope) || !instanceof_function(EG(scope), obj->zo.ce TSRMLS_CC)) {
- zend_error(E_WARNING, "Cannot access protected property %s::$%s", obj->zo.ce->name, Z_STRVAL_P(member));
- return EG(uninitialized_zval_ptr);
+ zval *return_value = &obj->_tmp_property;
+
+ /* public */
+ if (strcmp(Z_STRVAL_P(member), "nestedMessage")) {
+ if (!EG(scope) || !instanceof_function(EG(scope), obj->zo.ce TSRMLS_CC)) {
+ zend_error(E_WARNING, "Cannot access protected property %s::$%s", obj->zo.ce->name, Z_STRVAL_P(member));
+ return EG(uninitialized_zval_ptr);
+ }
}
- ALLOC_ZVAL(return_value);
- return_value->refcount = 0;
+ 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)),
}
break;
- case HTTP_MSG_PROPHASH_RAW:
- if (msg->raw) {
- if (msg->len) {
- RETVAL_STRINGL(msg->raw, msg->len, 1);
- } else {
- RETVAL_STRINGL(empty_string, 0, 0);
- }
- } else {
- RETVAL_NULL();
- }
- break;
-
case HTTP_MSG_PROPHASH_BODY:
phpstr_fix(PHPSTR(msg));
RETVAL_PHPSTR(PHPSTR(msg), 0, 1);
break;
case HTTP_MSG_PROPHASH_HEADERS:
- Z_TYPE_P(return_value) = IS_ARRAY;
- Z_ARRVAL_P(return_value) = &msg->hdrs;
+ 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;
case HTTP_MSG_PROPHASH_NESTED_MESSAGE:
RETVAL_NULL();
+ if (msg->nested) {
+ return obj->nested;
+ }
break;
case HTTP_MSG_PROPHASH_REQUEST_METHOD:
}
break;
- case HTTP_MSG_PROPHASH_RESPONSE_STATUS:
+ case HTTP_MSG_PROPHASH_RESPONSE_CODE:
if (msg->type == HTTP_MSG_RESPONSE) {
- RETVAL_LONG(msg->info.response.status);
+ RETVAL_LONG(msg->info.response.code);
} else {
RETVAL_NULL();
}
getObjectEx(http_message_object, obj, object);
http_message *msg = obj->message;
- if (!EG(scope) || !instanceof_function(EG(scope), obj->zo.ce TSRMLS_CC)) {
- zend_error(E_WARNING, "Cannot access protected property %s::$%s", obj->zo.ce->name, Z_STRVAL_P(member));
+ /* public */
+ if (strcmp("nestedMessage", Z_STRVAL_P(member))) {
+ if (!EG(scope) || !instanceof_function(EG(scope), obj->zo.ce TSRMLS_CC)) {
+ zend_error(E_WARNING, "Cannot access protected property %s::$%s", obj->zo.ce->name, Z_STRVAL_P(member));
+ }
}
#if 0
switch (zend_get_hash_value(Z_STRVAL_P(member), strlen(Z_STRVAL_P(member)) + 1))
{
case HTTP_MSG_PROPHASH_TYPE:
- msg->type = Z_LVAL_P(value);
+ if (Z_LVAL_P(value) != msg->type) {
+ if (msg->type == HTTP_MSG_REQUEST) {
+ if (msg->info.request.method) {
+ efree(msg->info.request.method);
+ }
+ if (msg->info.request.URI) {
+ efree(msg->info.request.URI);
+ }
+ }
+ msg->type = Z_LVAL_P(value);
+ if (msg->type == HTTP_MSG_REQUEST) {
+ msg->info.request.method = NULL;
+ msg->info.request.URI = NULL;
+ }
+ }
+
break;
case HTTP_MSG_PROPHASH_HTTP_VERSION:
}
break;
- case HTTP_MSG_PROPHASH_RAW:
- http_message_dtor(msg);
- http_message_parse_ex(msg, Z_STRVAL_P(value), Z_STRLEN_P(value), 1);
- break;
-
case HTTP_MSG_PROPHASH_BODY:
phpstr_dtor(PHPSTR(msg));
phpstr_from_string_ex(PHPSTR(msg), Z_STRVAL_P(value), Z_STRLEN_P(value));
break;
case HTTP_MSG_PROPHASH_NESTED_MESSAGE:
+ zval_ptr_dtor(&obj->nested);
+ obj->nested->value.obj = value->value.obj;
+ zval_add_ref(&value);
break;
case HTTP_MSG_PROPHASH_REQUEST_METHOD:
}
break;
- case HTTP_MSG_PROPHASH_RESPONSE_STATUS:
+ case HTTP_MSG_PROPHASH_RESPONSE_CODE:
if (msg->type == HTTP_MSG_RESPONSE) {
- msg->info.response.status = Z_LVAL_P(value);
+ msg->info.response.code = Z_LVAL_P(value);
}
break;
}
+ zval_dtor(value);
+ FREE_ZVAL(value);
}
static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC)
int m_prop_len; \
Z_ARRVAL(array) = OBJ_PROP(obj); \
zend_mangle_property_name(&m_prop_name, &m_prop_len, "*", 1, name, lenof(name), 1); \
- add_assoc_stringl_ex(&array, m_prop_name, sizeof(name)+4, val, len, val != empty_string); \
+ add_assoc_stringl_ex(&array, m_prop_name, sizeof(name)+4, val, len, 1); \
}
zend_hash_clean(OBJ_PROP(obj));
ASSOC_PROP(obj, long, "type", msg->type);
- ASSOC_STRINGL(obj, "raw", msg->raw, msg->len)
ASSOC_STRINGL(obj, "body", PHPSTR_VAL(msg), PHPSTR_LEN(msg));
MAKE_STD_ZVAL(headers);
{
case HTTP_MSG_REQUEST:
ASSOC_PROP(obj, double, "httpVersion", msg->info.request.http_version);
- ASSOC_PROP(obj, long, "responseStatus", 0);
+ ASSOC_PROP(obj, long, "responseCode", 0);
ASSOC_STRING(obj, "requestMethod", msg->info.request.method);
ASSOC_STRING(obj, "requestUri", msg->info.request.URI);
break;
case HTTP_MSG_RESPONSE:
ASSOC_PROP(obj, double, "httpVersion", msg->info.response.http_version);
- ASSOC_PROP(obj, long, "responseStatus", msg->info.response.status);
- ASSOC_STRING(obj, "requestMethod", empty_string);
- ASSOC_STRING(obj, "requestUri", empty_string);
+ ASSOC_PROP(obj, long, "responseCode", msg->info.response.code);
+ ASSOC_STRING(obj, "requestMethod", "");
+ ASSOC_STRING(obj, "requestUri", "");
break;
case HTTP_MSG_NONE:
default:
ASSOC_PROP(obj, double, "httpVersion", 0.0);
- ASSOC_PROP(obj, long, "responseStatus", 0);
- ASSOC_STRING(obj, "requestMethod", empty_string);
- ASSOC_STRING(obj, "requestUri", empty_string);
+ ASSOC_PROP(obj, long, "responseCode", 0);
+ ASSOC_STRING(obj, "requestMethod", "");
+ ASSOC_STRING(obj, "requestUri", "");
break;
}
projects / m6w6 / ext-http / blobdiff