#define HTTP_RESPONSE_ME(method, visibility) PHP_ME(HttpResponse, method, HTTP_ARGS(HttpResponse, method), visibility|ZEND_ACC_STATIC)
#define HTTP_RESPONSE_ALIAS(method, func) HTTP_STATIC_ME_ALIAS(method, func, HTTP_ARGS(HttpResponse, method))
-HTTP_BEGIN_ARGS(setHeader, 2)
+HTTP_BEGIN_ARGS(setHeader, 1)
HTTP_ARG_VAL(name, 0)
HTTP_ARG_VAL(value, 0)
HTTP_ARG_VAL(replace, 0)
HTTP_EMPTY_ARGS(getRequestHeaders);
HTTP_EMPTY_ARGS(getRequestBody);
+HTTP_EMPTY_ARGS(getRequestBodyStream);
#define http_grab_response_headers _http_grab_response_headers
static void _http_grab_response_headers(void *data, void *arg TSRMLS_DC);
HTTP_RESPONSE_ALIAS(status, http_send_status)
HTTP_RESPONSE_ALIAS(getRequestHeaders, http_get_request_headers)
HTTP_RESPONSE_ALIAS(getRequestBody, http_get_request_body)
+ HTTP_RESPONSE_ALIAS(getRequestBodyStream, http_get_request_body_stream)
EMPTY_FUNCTION_ENTRY
};
DCL_STATIC_PROP_N(PROTECTED, cacheControl);
DCL_STATIC_PROP_N(PROTECTED, contentType);
DCL_STATIC_PROP_N(PROTECTED, contentDisposition);
- DCL_STATIC_PROP(PROTECTED, long, bufferSize, HTTP_SENDBUF_SIZE);
+ DCL_STATIC_PROP(PROTECTED, long, bufferSize, 0);
DCL_STATIC_PROP(PROTECTED, double, throttleDelay, 0.0);
#ifndef WONKY
/* ### USERLAND ### */
-/* {{{ proto static bool HttpResponse::setHeader(string name, mixed value[, bool replace = true])
+/* {{{ proto static bool HttpResponse::setHeader(string name[, mixed value[, bool replace = true]])
*
* Send an HTTP header.
*
zend_bool replace = 1;
char *name;
int name_len = 0;
- zval *value = NULL, *orig = NULL;
+ zval *value = NULL;
- if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz/!|b", &name, &name_len, &value, &replace)) {
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|z/!b", &name, &name_len, &value, &replace)) {
RETURN_FALSE;
}
if (SG(headers_sent)) {
http_error(HE_WARNING, HTTP_E_HEADER, "Cannot send anonymous headers");
RETURN_FALSE;
}
-
- /* delete header if value == null */
- if (!value || Z_TYPE_P(value) == IS_NULL) {
- RETURN_SUCCESS(http_send_header_ex(name, name_len, "", 0, replace, NULL));
- }
- /* send multiple header if replace is false and value is an array */
- if (!replace && Z_TYPE_P(value) == IS_ARRAY) {
- zval **data;
- HashPosition pos;
-
- FOREACH_VAL(pos, value, data) {
- zval *orig = *data;
-
- convert_to_string_ex(data);
- if (SUCCESS != http_send_header_ex(name, name_len, Z_STRVAL_PP(data), Z_STRLEN_PP(data), 0, NULL)) {
- if (orig != *data) {
- zval_ptr_dtor(data);
- }
- RETURN_FALSE;
- }
- if (orig != *data) {
- zval_ptr_dtor(data);
- }
- }
- RETURN_TRUE;
- }
- /* send standard header */
- orig = value;
- convert_to_string_ex(&value);
- RETVAL_SUCCESS(http_send_header_ex(name, name_len, Z_STRVAL_P(value), Z_STRLEN_P(value), replace, NULL));
- if (orig != value) {
- zval_ptr_dtor(&value);
- }
+ http_send_header_zval_ex(name, name_len, &value, replace);
+ RETURN_TRUE;
}
/* }}} */
* header to read. If the parameter is empty or omitted, an associative array
* with all headers will be returned.
*
+ * NOTE: In Apache2 this only works for PHP-5.1.3 and greater.
+ *
* Returns either a string containing the value of the header matching name,
* FALSE on failure, or an associative array with all headers.
*/
zend_hash_init(&headers_ht, sizeof(zval *), NULL, ZVAL_PTR_DTOR, 0);
if ( (SUCCESS == http_parse_headers_ex(PHPSTR_VAL(&headers), &headers_ht, 1)) &&
- (SUCCESS == zend_hash_find(&headers_ht, name, name_len + 1, (void **) &header))) {
+ (SUCCESS == zend_hash_find(&headers_ht, name, name_len + 1, (void *) &header))) {
RETVAL_ZVAL(*header, 1, 0);
} else {
RETVAL_NULL();
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
zval *cache_p, *cache = convert_to_type_ex(IS_BOOL, GET_STATIC_PROP(cache), &cache_p);
RETVAL_ZVAL(cache, 1, 0);
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
zval *gzip_p, *gzip = convert_to_type_ex(IS_BOOL, GET_STATIC_PROP(gzip), &gzip_p);
RETVAL_ZVAL(gzip, 1, 0);
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
zval *ccontrol_p, *ccontrol = convert_to_type_ex(IS_STRING, GET_STATIC_PROP(cacheControl), &ccontrol_p);
RETVAL_ZVAL(ccontrol, 1, 0);
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
zval *ctype_p, *ctype = convert_to_type_ex(IS_STRING, GET_STATIC_PROP(contentType), &ctype_p);
RETVAL_ZVAL(ctype, 1, 0);
{
zval *data = GET_STATIC_PROP(data);
ct = http_guess_content_type(magic_file, magic_mode, Z_STRVAL_P(data), Z_STRLEN_P(data), SEND_DATA);
+ break;
}
- break;
case SEND_RSRC:
{
z->type = IS_RESOURCE;
php_stream_from_zval(s, &z);
ct = http_guess_content_type(magic_file, magic_mode, s, 0, SEND_RSRC);
+ break;
}
- break;
default:
ct = http_guess_content_type(magic_file, magic_mode, Z_STRVAL_P(GET_STATIC_PROP(file)), 0, -1);
- break;
+ break;
}
if (ct) {
UPD_STATIC_PROP(string, contentType, ct);
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
zval *cd_p, *cd = convert_to_type_ex(IS_STRING, GET_STATIC_PROP(contentDisposition), &cd_p);
RETVAL_ZVAL(cd, 1, 0);
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
zval *etag_p, *etag = convert_to_type_ex(IS_STRING, GET_STATIC_PROP(eTag), &etag_p);
RETVAL_ZVAL(etag, 1, 0);
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
zval *lm_p, *lm = convert_to_type_ex(IS_LONG, GET_STATIC_PROP(lastModified), &lm_p);
RETVAL_ZVAL(lm, 1, 0);
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
zval *delay_p, *delay = convert_to_type_ex(IS_DOUBLE, GET_STATIC_PROP(throttleDelay), &delay_p);
RETVAL_ZVAL(delay, 1, 0);
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
zval *size_p, *size = convert_to_type_ex(IS_LONG, GET_STATIC_PROP(bufferSize), &size_p);
RETVAL_ZVAL(size, 1, 0);
char *etag;
zval *the_data;
- if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &the_data)) {
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/", &the_data)) {
RETURN_FALSE;
}
if (Z_TYPE_P(the_data) != IS_STRING) {
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
zval *the_data = GET_STATIC_PROP(data);
RETURN_ZVAL(the_data, 1, 0);
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
zval *stream_p;
RETVAL_RESOURCE(Z_LVAL_P(convert_to_type_ex(IS_LONG, GET_STATIC_PROP(stream), &stream_p)));
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
zval *the_file_p, *the_file = convert_to_type_ex(IS_STRING, GET_STATIC_PROP(file), &the_file_p);
RETVAL_ZVAL(the_file, 1, 0);
/* caching */
if (zval_is_true(GET_STATIC_PROP(cache))) {
zval *cctl, *cctl_p, *etag, *etag_p, *lmod, *lmod_p;
-
+
etag = convert_to_type_ex(IS_STRING, GET_STATIC_PROP(eTag), &etag_p);
lmod = convert_to_type_ex(IS_LONG, GET_STATIC_PROP(lastModified), &lmod_p);
cctl = convert_to_type_ex(IS_STRING, GET_STATIC_PROP(cacheControl), &cctl_p);
-
- http_cache_etag(Z_STRVAL_P(etag), Z_STRLEN_P(etag), Z_STRVAL_P(cctl), Z_STRLEN_P(cctl));
- http_cache_last_modified(Z_LVAL_P(lmod), Z_LVAL_P(lmod) ? Z_LVAL_P(lmod) : HTTP_GET_REQUEST_TIME(), Z_STRVAL_P(cctl), Z_STRLEN_P(cctl));
-
+
+ if (Z_LVAL_P(lmod) || Z_STRLEN_P(etag)) {
+ if (Z_STRLEN_P(cctl)) {
+ http_send_cache_control(Z_STRVAL_P(cctl), Z_STRLEN_P(cctl));
+ } else {
+ http_send_cache_control(HTTP_DEFAULT_CACHECONTROL, lenof(HTTP_DEFAULT_CACHECONTROL));
+ }
+ if (Z_STRLEN_P(etag)) {
+ http_send_etag(Z_STRVAL_P(etag), Z_STRLEN_P(etag));
+ }
+ if (Z_LVAL_P(lmod)) {
+ http_send_last_modified(Z_LVAL_P(lmod));
+ }
+ }
+
if (etag_p) zval_ptr_dtor(&etag_p);
if (lmod_p) zval_ptr_dtor(&lmod_p);
if (cctl_p) zval_ptr_dtor(&cctl_p);
-
- if (php_ob_handler_used("blackhole" TSRMLS_CC)) {
- RETURN_TRUE;
- }
}
/* content type */
}
/* gzip */
- HTTP_G->send.deflate.encoding = zval_is_true(GET_STATIC_PROP(gzip));
+ HTTP_G->send.deflate.response = zval_is_true(GET_STATIC_PROP(gzip));
- /* start ob */
- php_start_ob_buffer(NULL, HTTP_G->send.buffer_size, 0 TSRMLS_CC);
-
/* send */
- switch (Z_LVAL_P(GET_STATIC_PROP(mode)))
- {
+ switch (Z_LVAL_P(GET_STATIC_PROP(mode))) {
case SEND_DATA:
{
zval *zdata_p, *zdata = convert_to_type_ex(IS_STRING, GET_STATIC_PROP(data), &zdata_p);
- RETVAL_SUCCESS(http_send_data_ex(Z_STRVAL_P(zdata), Z_STRLEN_P(zdata), 1));
+ RETVAL_SUCCESS(http_send_data(Z_STRVAL_P(zdata), Z_STRLEN_P(zdata)));
if (zdata_p) zval_ptr_dtor(&zdata_p);
return;
}
zval *the_stream_p, *the_stream = convert_to_type_ex(IS_LONG, GET_STATIC_PROP(stream), &the_stream_p);
the_stream->type = IS_RESOURCE;
php_stream_from_zval(the_real_stream, &the_stream);
- RETVAL_SUCCESS(http_send_stream_ex(the_real_stream, 0, 1));
+ RETVAL_SUCCESS(http_send_stream(the_real_stream));
if (the_stream_p) zval_ptr_dtor(&the_stream_p);
return;
}
default:
{
zval *file_p;
- RETVAL_SUCCESS(http_send_file_ex(Z_STRVAL_P(convert_to_type_ex(IS_STRING, GET_STATIC_PROP(file), &file_p)), 1));
+ RETVAL_SUCCESS(http_send_file(Z_STRVAL_P(convert_to_type_ex(IS_STRING, GET_STATIC_PROP(file), &file_p))));
if (file_p) zval_ptr_dtor(&file_p);
return;
}
UPD_STATIC_PROP(long, catch, 1);
php_end_ob_buffers(0 TSRMLS_CC);
- php_start_ob_buffer(NULL, 40960, 0 TSRMLS_CC);
+ php_start_ob_buffer(NULL, 0, 0 TSRMLS_CC);
/* register shutdown function */
{
projects / m6w6 / ext-http / blobdiff