#include "php_http_exception_object.h"
#include "phpstr/phpstr.h"
+#include "missing.h"
ZEND_EXTERN_MODULE_GLOBALS(http);
HTTP_END_ARGS;
HTTP_EMPTY_ARGS(getBody, 0);
+HTTP_BEGIN_ARGS(setBody, 0, 1)
+ HTTP_ARG_VAL(body, 0)
+HTTP_END_ARGS;
+
HTTP_EMPTY_ARGS(getHeaders, 0);
HTTP_BEGIN_ARGS(setHeaders, 0, 1)
HTTP_ARG_VAL(headers, 0)
zend_function_entry http_message_object_fe[] = {
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(getHeaders, ZEND_ACC_PUBLIC)
HTTP_MESSAGE_ME(setHeaders, ZEND_ACC_PUBLIC)
HTTP_MESSAGE_ME(addHeaders, 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}
+
+ EMPTY_FUNCTION_ENTRY
};
static zend_object_handlers http_message_object_handlers;
void _http_message_object_init(INIT_FUNC_ARGS)
{
- zval constants;
-
HTTP_REGISTER_CLASS_EX(HttpMessage, http_message_object, NULL, 0);
HTTP_LONG_CONSTANT("HTTP_MSG_NONE", HTTP_MSG_NONE);
{
zend_class_entry *ce = http_message_object_ce;
- DCL_CONST(long, "NONE", HTTP_MSG_NONE);
- DCL_CONST(long, "REQUEST", HTTP_MSG_REQUEST);
- DCL_CONST(long, "RESPONSE", HTTP_MSG_RESPONSE);
+#ifndef WONKY
+ DCL_CONST(long, "TYPE_NONE", HTTP_MSG_NONE);
+ DCL_CONST(long, "TYPE_REQUEST", HTTP_MSG_REQUEST);
+ DCL_CONST(long, "TYPE_RESPONSE", HTTP_MSG_RESPONSE);
+#endif
DCL_PROP(PROTECTED, long, type, HTTP_MSG_NONE);
DCL_PROP(PROTECTED, string, body, "");
getObjectEx(http_message_object, obj, object);
http_message *msg = obj->message;
zval *return_value;
+#ifdef WONKY
+ zend_hash_value h = zend_get_hash_value(Z_STRVAL_P(member), Z_STRLEN_P(member)+1);
+#else
+ zend_property_info *pinfo = zend_get_property_info(obj->zo.ce, member, 1 TSRMLS_CC);
+
+ if (!pinfo || ACC_PROP_PUBLIC(pinfo->flags)) {
+ return zend_get_std_object_handlers()->read_property(object, member, type TSRMLS_CC);
+ }
+#endif
return_value = &EG(uninitialized_zval);
return_value->refcount = 0;
return_value->is_ref = 0;
-#if 0
- fprintf(stderr, "Read HttpMessage::$%s\n", Z_STRVAL_P(member));
+#ifdef WONKY
+ switch (h)
+#else
+ switch (pinfo->h)
#endif
- if (!EG(scope) || !instanceof_function(EG(scope), obj->zo.ce TSRMLS_CC)) {
- zend_error(HE_WARNING, "Cannot access protected property %s::$%s", obj->zo.ce->name, Z_STRVAL_P(member));
- return EG(uninitialized_zval_ptr);
- }
-
- switch (zend_get_hash_value(Z_STRVAL_P(member), Z_STRLEN_P(member) + 1))
{
case HTTP_MSG_PROPHASH_TYPE:
RETVAL_LONG(msg->type);
break;
case HTTP_MSG_PROPHASH_HTTP_VERSION:
- switch (msg->type)
- {
- 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;
- }
+ RETVAL_DOUBLE(msg->http.version);
break;
case HTTP_MSG_PROPHASH_BODY:
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->parent;
- zend_objects_store_add_ref(return_value TSRMLS_CC);
} else {
RETVAL_NULL();
}
break;
case HTTP_MSG_PROPHASH_REQUEST_METHOD:
- if (HTTP_MSG_TYPE(REQUEST, msg) && msg->info.request.method) {
- RETVAL_STRING(msg->info.request.method, 1);
+ if (HTTP_MSG_TYPE(REQUEST, msg) && msg->http.info.request.method) {
+ RETVAL_STRING(msg->http.info.request.method, 1);
} else {
RETVAL_NULL();
}
break;
case HTTP_MSG_PROPHASH_REQUEST_URI:
- if (HTTP_MSG_TYPE(REQUEST, msg) && msg->info.request.URI) {
- RETVAL_STRING(msg->info.request.URI, 1);
+ if (HTTP_MSG_TYPE(REQUEST, msg) && msg->http.info.request.URI) {
+ RETVAL_STRING(msg->http.info.request.URI, 1);
} else {
RETVAL_NULL();
}
case HTTP_MSG_PROPHASH_RESPONSE_CODE:
if (HTTP_MSG_TYPE(RESPONSE, msg)) {
- RETVAL_LONG(msg->info.response.code);
+ RETVAL_LONG(msg->http.info.response.code);
} else {
RETVAL_NULL();
}
break;
-
+
+ case HTTP_MSG_PROPHASH_RESPONSE_STATUS:
+ if (HTTP_MSG_TYPE(RESPONSE, msg) && msg->http.info.response.status) {
+ RETVAL_STRING(msg->http.info.response.status, 1);
+ } else {
+ RETVAL_NULL();
+ }
+ break;
+
default:
+#ifdef WONKY
+ return zend_get_std_object_handlers()->read_property(object, member, type TSRMLS_CC);
+#else
RETVAL_NULL();
+#endif
break;
}
{
getObjectEx(http_message_object, obj, object);
http_message *msg = obj->message;
-
-#if 0
- fprintf(stderr, "Write HttpMessage::$%s\n", Z_STRVAL_P(member));
-#endif
- if (!EG(scope) || !instanceof_function(EG(scope), obj->zo.ce TSRMLS_CC)) {
- zend_error(HE_WARNING, "Cannot access protected property %s::$%s", obj->zo.ce->name, Z_STRVAL_P(member));
+#ifdef WONKY
+ zend_hash_value h = zend_get_hash_value(Z_STRVAL_P(member), Z_STRLEN_P(member) + 1);
+#else
+ zend_property_info *pinfo = zend_get_property_info(obj->zo.ce, member, 1 TSRMLS_CC);
+
+ if (!pinfo || ACC_PROP_PUBLIC(pinfo->flags)) {
+ zend_get_std_object_handlers()->write_property(object, member, value TSRMLS_CC);
+ return;
}
+#endif
- switch (zend_get_hash_value(Z_STRVAL_P(member), Z_STRLEN_P(member) + 1))
+#ifdef WONKY
+ switch (h)
+#else
+ switch (pinfo->h)
+#endif
{
case HTTP_MSG_PROPHASH_TYPE:
convert_to_long_ex(&value);
- if ((http_message_type) Z_LVAL_P(value) != msg->type) {
- if (HTTP_MSG_TYPE(REQUEST, msg)) {
- 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 (HTTP_MSG_TYPE(REQUEST, msg)) {
- msg->info.request.method = NULL;
- msg->info.request.URI = NULL;
- }
- }
-
+ http_message_set_type(msg, Z_LVAL_P(value));
break;
case HTTP_MSG_PROPHASH_HTTP_VERSION:
convert_to_double_ex(&value);
- switch (msg->type)
- {
- case HTTP_MSG_REQUEST:
- msg->info.request.http_version = Z_DVAL_P(value);
- break;
-
- case HTTP_MSG_RESPONSE:
- msg->info.response.http_version = Z_DVAL_P(value);
- break;
- }
+ msg->http.version = Z_DVAL_P(value);
break;
case HTTP_MSG_PROPHASH_BODY:
break;
case HTTP_MSG_PROPHASH_REQUEST_METHOD:
- convert_to_string_ex(&value);
if (HTTP_MSG_TYPE(REQUEST, msg)) {
- if (msg->info.request.method) {
- efree(msg->info.request.method);
- }
- msg->info.request.method = estrndup(Z_STRVAL_P(value), Z_STRLEN_P(value));
+ convert_to_string_ex(&value);
+ STR_SET(msg->http.info.request.method, estrndup(Z_STRVAL_P(value), Z_STRLEN_P(value)));
}
break;
case HTTP_MSG_PROPHASH_REQUEST_URI:
- convert_to_string_ex(&value);
if (HTTP_MSG_TYPE(REQUEST, msg)) {
- if (msg->info.request.URI) {
- efree(msg->info.request.URI);
- }
- msg->info.request.URI = estrndup(Z_STRVAL_P(value), Z_STRLEN_P(value));
+ convert_to_string_ex(&value);
+ STR_SET(msg->http.info.request.URI, estrndup(Z_STRVAL_P(value), Z_STRLEN_P(value)));
}
break;
case HTTP_MSG_PROPHASH_RESPONSE_CODE:
- convert_to_long_ex(&value);
if (HTTP_MSG_TYPE(RESPONSE, msg)) {
- msg->info.response.code = Z_LVAL_P(value);
+ convert_to_long_ex(&value);
+ msg->http.info.response.code = Z_LVAL_P(value);
+ }
+ break;
+
+ case HTTP_MSG_PROPHASH_RESPONSE_STATUS:
+ if (HTTP_MSG_TYPE(RESPONSE, msg)) {
+ convert_to_string_ex(&value);
+ STR_SET(msg->http.info.response.status, estrndup(Z_STRVAL_P(value), Z_STRLEN_P(value)));
}
break;
+
+ default:
+#ifdef WONKY
+ zend_get_std_object_handlers()->write_property(object, member, value TSRMLS_CC);
+#endif
+ break;
}
}
zval *headers;
getObjectEx(http_message_object, obj, object);
http_message *msg = obj->message;
+ HashTable *props = OBJ_PROP(obj);
+ zval array;
+
+ INIT_ZARR(array, props);
-#define ASSOC_PROP(obj, ptype, name, val) \
+#define ASSOC_PROP(array, ptype, name, val) \
{ \
- zval array; \
char *m_prop_name; \
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); \
+ zend_mangle_property_name(&m_prop_name, &m_prop_len, "*", 1, name, lenof(name), 0); \
add_assoc_ ##ptype## _ex(&array, m_prop_name, sizeof(name)+4, val); \
+ efree(m_prop_name); \
}
-#define ASSOC_STRING(obj, name, val) ASSOC_STRINGL(obj, name, val, strlen(val))
-#define ASSOC_STRINGL(obj, name, val, len) \
+#define ASSOC_STRING(array, name, val) ASSOC_STRINGL(array, name, val, strlen(val))
+#define ASSOC_STRINGL(array, name, val, len) \
{ \
- zval array; \
char *m_prop_name; \
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); \
+ zend_mangle_property_name(&m_prop_name, &m_prop_len, "*", 1, name, lenof(name), 0); \
add_assoc_stringl_ex(&array, m_prop_name, sizeof(name)+4, val, len, 1); \
+ efree(m_prop_name); \
}
- zend_hash_clean(OBJ_PROP(obj));
-
- ASSOC_PROP(obj, long, "type", msg->type);
- ASSOC_STRINGL(obj, "body", PHPSTR_VAL(msg), PHPSTR_LEN(msg));
-
- MAKE_STD_ZVAL(headers);
- array_init(headers);
-
- zend_hash_copy(Z_ARRVAL_P(headers), &msg->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
- ASSOC_PROP(obj, zval, "headers", headers);
+ ASSOC_PROP(array, long, "type", msg->type);
+ ASSOC_PROP(array, double, "httpVersion", msg->http.version);
switch (msg->type)
{
case HTTP_MSG_REQUEST:
- ASSOC_PROP(obj, double, "httpVersion", msg->info.request.http_version);
- ASSOC_PROP(obj, long, "responseCode", 0);
- ASSOC_STRING(obj, "requestMethod", msg->info.request.method);
- ASSOC_STRING(obj, "requestUri", msg->info.request.URI);
+ ASSOC_PROP(array, long, "responseCode", 0);
+ ASSOC_STRINGL(array, "responseStatus", "", 0);
+ ASSOC_STRING(array, "requestMethod", msg->http.info.request.method);
+ ASSOC_STRING(array, "requestUri", msg->http.info.request.URI);
break;
case HTTP_MSG_RESPONSE:
- ASSOC_PROP(obj, double, "httpVersion", msg->info.response.http_version);
- ASSOC_PROP(obj, long, "responseCode", msg->info.response.code);
- ASSOC_STRING(obj, "requestMethod", "");
- ASSOC_STRING(obj, "requestUri", "");
+ ASSOC_PROP(array, long, "responseCode", msg->http.info.response.code);
+ ASSOC_STRING(array, "responseStatus", msg->http.info.response.status);
+ ASSOC_STRINGL(array, "requestMethod", "", 0);
+ ASSOC_STRINGL(array, "requestUri", "", 0);
break;
case HTTP_MSG_NONE:
default:
- ASSOC_PROP(obj, double, "httpVersion", 0.0);
- ASSOC_PROP(obj, long, "responseCode", 0);
- ASSOC_STRING(obj, "requestMethod", "");
- ASSOC_STRING(obj, "requestUri", "");
+ ASSOC_PROP(array, long, "responseCode", 0);
+ ASSOC_STRINGL(array, "responseStatus", "", 0);
+ ASSOC_STRINGL(array, "requestMethod", "", 0);
+ ASSOC_STRINGL(array, "requestUri", "", 0);
break;
}
+ MAKE_STD_ZVAL(headers);
+ array_init(headers);
+ zend_hash_copy(Z_ARRVAL_P(headers), &msg->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
+ ASSOC_PROP(array, zval, "headers", headers);
+ ASSOC_STRINGL(array, "body", PHPSTR_VAL(msg), PHPSTR_LEN(msg));
+
return OBJ_PROP(obj);
}
}
/* }}} */
+/* {{{ proto void HttpMessage::setBody(string body)
+ *
+ * Set the body of the HttpMessage.
+ * NOTE: Don't forget to update any headers accordingly.
+ */
+PHP_METHOD(HttpMessage, setBody)
+{
+ char *body;
+ int len;
+ getObject(http_message_object, obj);
+
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &body, &len)) {
+ phpstr_dtor(PHPSTR(obj->message));
+ phpstr_from_string_ex(PHPSTR(obj->message), body, len);
+ }
+}
+/* }}} */
+
/* {{{ proto array HttpMessage::getHeaders()
*
* Get Message Headers.
zval headers;
getObject(http_message_object, obj);
- Z_ARRVAL(headers) = &obj->message->hdrs;
+ INIT_ZARR(headers, &obj->message->hdrs);
array_init(return_value);
array_copy(&headers, return_value);
}
}
zend_hash_clean(&obj->message->hdrs);
- Z_ARRVAL(old_headers) = &obj->message->hdrs;
+ INIT_ZARR(old_headers, &obj->message->hdrs);
array_copy(new_headers, &old_headers);
}
/* }}} */
return;
}
- Z_ARRVAL(old_headers) = &obj->message->hdrs;
+ INIT_ZARR(old_headers, &obj->message->hdrs);
if (append) {
array_append(new_headers, &old_headers);
} else {
RETURN_NULL();
}
- RETURN_LONG(obj->message->info.response.code);
+ RETURN_LONG(obj->message->http.info.response.code);
}
}
/* }}} */
RETURN_FALSE;
}
- obj->message->info.response.code = code;
+ obj->message->http.info.response.code = code;
RETURN_TRUE;
}
/* }}} */
RETURN_NULL();
}
- RETURN_STRING(obj->message->info.request.method, 1);
+ RETURN_STRING(obj->message->http.info.request.method, 1);
}
}
/* }}} */
RETURN_FALSE;
}
- STR_SET(obj->message->info.request.method, estrndup(method, method_len));
+ STR_SET(obj->message->http.info.request.method, estrndup(method, method_len));
RETURN_TRUE;
}
/* }}} */
RETURN_NULL();
}
- RETURN_STRING(obj->message->info.request.URI, 1);
+ RETURN_STRING(obj->message->http.info.request.URI, 1);
}
}
/* }}} */
RETURN_FALSE;
}
- STR_SET(obj->message->info.request.URI, estrndup(URI, URIlen));
+ STR_SET(obj->message->http.info.request.URI, estrndup(URI, URIlen));
RETURN_TRUE;
}
/* }}} */
IF_RETVAL_USED {
char ver[4] = {0};
- double version;
getObject(http_message_object, obj);
- switch (obj->message->type)
- {
- case HTTP_MSG_RESPONSE:
- version = obj->message->info.response.http_version;
- break;
-
- case HTTP_MSG_REQUEST:
- version = obj->message->info.request.http_version;
- break;
-
- case HTTP_MSG_NONE:
- default:
- RETURN_NULL();
- }
- sprintf(ver, "%1.1lf", version);
+ sprintf(ver, "%1.1lf", obj->message->http.version);
RETURN_STRINGL(ver, 3, 1);
}
}
return;
}
- if (HTTP_MSG_TYPE(NONE, obj->message)) {
- http_error(HE_WARNING, HTTP_E_MESSAGE_TYPE, "Message is neither of type HTTP_MSG_RESPONSE nor HTTP_MSG_REQUEST");
- RETURN_FALSE;
- }
-
convert_to_double(zv);
sprintf(v, "%1.1lf", Z_DVAL_P(zv));
if (strcmp(v, "1.0") && strcmp(v, "1.1")) {
RETURN_FALSE;
}
- if (HTTP_MSG_TYPE(RESPONSE, obj->message)) {
- obj->message->info.response.http_version = Z_DVAL_P(zv);
- } else {
- obj->message->info.request.http_version = Z_DVAL_P(zv);
- }
+ obj->message->http.version = Z_DVAL_P(zv);
RETURN_TRUE;
}
/* }}} */
}
/* }}} */
-/* {{{ proto string HttpMessage::toString([bool include_parent = true])
+/* {{{ proto string HttpMessage::toString([bool include_parent = false])
*
* Get the string representation of the Message.
*/
IF_RETVAL_USED {
char *string;
size_t length;
- zend_bool include_parent = 1;
+ zend_bool include_parent = 0;
getObject(http_message_object, obj);
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &include_parent)) {
projects / m6w6 / ext-http / blobdiff