PHP_ME(HttpMessage, setRaw, NULL, ZEND_ACC_PUBLIC)
PHP_ME(HttpMessage, getBody, NULL, ZEND_ACC_PUBLIC)
PHP_ME(HttpMessage, getHeaders, NULL, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpMessage, getType, NULL, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpMessage, getResponseCode, NULL, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpMessage, getRequestMethod, NULL, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpMessage, getRequestUri, NULL, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpMessage, getHttpVersion, 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();
+ o->message = msg ? msg : http_message_new();
ALLOC_HASHTABLE(OBJ_PROP(o));
zend_hash_init(OBJ_PROP(o), 0, NULL, ZVAL_PTR_DTOR, 0);
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);
if (msg->len) {
RETVAL_STRINGL(msg->raw, msg->len, 1);
} else {
- RETVAL_STRINGL(empty_string, 0, 1);
+ RETVAL_STRINGL("", 0, 1);
}
} else {
RETVAL_NULL();
}
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();
}
}
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;
}
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));
{
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;
}