#endif
#include "php.h"
-#ifdef ZEND_ENGINE_2
+#include "missing.h"
+
+/* broken static properties in PHP 5.0 */
+#if defined(ZEND_ENGINE_2) && !defined(WONKY)
#include "SAPI.h"
#include "php_ini.h"
#include "php_http_send_api.h"
#include "php_http_cache_api.h"
-#include "missing.h"
-
ZEND_EXTERN_MODULE_GLOBALS(http);
#define GET_STATIC_PROP(n) *GET_STATIC_PROP_EX(http_response_object_ce, n)
HTTP_ARG_VAL(content_type, 0)
HTTP_END_ARGS;
+HTTP_BEGIN_ARGS(guessContentType, 1)
+ HTTP_ARG_VAL(magic_file, 0)
+ HTTP_ARG_VAL(magic_mode, 0)
+HTTP_END_ARGS;
+
HTTP_EMPTY_ARGS(getContentDisposition, 0);
HTTP_BEGIN_ARGS(setContentDisposition, 1)
HTTP_ARG_VAL(filename, 0)
#define http_response_object_declare_default_properties() _http_response_object_declare_default_properties(TSRMLS_C)
static inline void _http_response_object_declare_default_properties(TSRMLS_D);
-HashTable http_response_statics;
-
zend_class_entry *http_response_object_ce;
zend_function_entry http_response_object_fe[] = {
HTTP_RESPONSE_ME(setContentType, ZEND_ACC_PUBLIC)
HTTP_RESPONSE_ME(getContentType, ZEND_ACC_PUBLIC)
+
+ HTTP_RESPONSE_ME(guessContentType, ZEND_ACC_PUBLIC)
HTTP_RESPONSE_ME(setCache, ZEND_ACC_PUBLIC)
HTTP_RESPONSE_ME(getCache, ZEND_ACC_PUBLIC)
array_init(return_value);
array_copy(headers, return_value);
} else if (SUCCESS == zend_hash_find(Z_ARRVAL_P(headers), name, name_len + 1, (void **) &header)) {
- RETURN_ZVAL(*header, ZVAL_PTR_DTOR, 1);
+ RETURN_ZVAL(*header, 1, 0);
} else {
RETURN_NULL();
}
/* {{{ proto static bool HttpResponse::setGzip(bool gzip)
*
- * Enable on-thy-fly gzipping of the sent entity. NOT IMPLEMENTED YET.
+ * Enable on-thy-fly gzipping of the sent entity.
*/
PHP_METHOD(HttpResponse, setGzip)
{
}
/* }}} */
+/* {{{ proto static string HttpResponse::guessContentType(string magic_file[, long magic_mode])
+ *
+ * Attempts to guess the content type of supplied payload through libmagic.
+ * See docs/KnownIssues.txt!
+ */
+PHP_METHOD(HttpResponse, guessContentType)
+{
+ char *magic_file, *ct = NULL;
+ int magic_file_len;
+ long magic_mode = 0;
+
+ RETVAL_NULL();
+
+ SET_EH_THROW_HTTP();
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &magic_file, &magic_file_len, &magic_mode)) {
+ switch (Z_LVAL_P(GET_STATIC_PROP(mode))) {
+ case SEND_DATA:
+ {
+ 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;
+
+ case SEND_RSRC:
+ {
+ php_stream *s;
+ zval *z = GET_STATIC_PROP(stream);
+ z->type = IS_RESOURCE;
+ php_stream_from_zval(s, &z);
+ ct = http_guess_content_type(magic_file, magic_mode, s, 0, SEND_RSRC);
+ }
+ break;
+
+ default:
+ ct = http_guess_content_type(magic_file, magic_mode, Z_STRVAL_P(GET_STATIC_PROP(file)), 0, -1);
+ break;
+ }
+ if (ct) {
+ UPD_STATIC_PROP(string, contentType, ct);
+ RETVAL_STRING(ct, 0);
+ }
+ }
+ SET_EH_NORMAL();
+}
+/* }}} */
+
/* {{{ proto static bool HttpResponse::setContentDisposition(string filename[, bool inline = false])
*
* Set the Content-Disposition of the sent entity. This setting aims to suggest
{
zval *the_stream;
php_stream *the_real_stream;
+ php_stream_statbuf ssb;
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &the_stream)) {
RETURN_FALSE;
}
zend_list_addref(Z_LVAL_P(the_stream));
php_stream_from_zval(the_real_stream, &the_stream);
+
+ if (php_stream_stat(the_real_stream, &ssb)) {
+ RETURN_FALSE;
+ }
if ( (SUCCESS != UPD_STATIC_PROP(long, stream, Z_LVAL_P(the_stream))) ||
(SUCCESS != UPD_STATIC_PROP(long, mode, SEND_RSRC))) {
{
char *the_file;
int file_len;
+ php_stream_statbuf ssb;
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &the_file, &file_len)) {
RETURN_FALSE;
}
+ if (php_stream_stat_path(the_file, &ssb)) {
+ RETURN_FALSE;
+ }
+
if ( (SUCCESS != UPD_STATIC_PROP(string, file, the_file)) ||
(SUCCESS != UPD_STATIC_PROP(long, mode, -1))) {
RETURN_FALSE;
/* capture mode */
if (Z_BVAL_P(GET_STATIC_PROP(catch))) {
- zval the_data;
+ zval *the_data;
- INIT_PZVAL(&the_data);
- php_ob_get_buffer(&the_data TSRMLS_CC);
- SET_STATIC_PROP(data, &the_data);
+ MAKE_STD_ZVAL(the_data);
+ php_ob_get_buffer(the_data TSRMLS_CC);
+ SET_STATIC_PROP(data, the_data);
ZVAL_LONG(GET_STATIC_PROP(mode), SEND_DATA);
if (!Z_STRLEN_P(GET_STATIC_PROP(eTag))) {
- char *etag = http_etag(Z_STRVAL(the_data), Z_STRLEN(the_data), SEND_DATA);
+ char *etag = http_etag(Z_STRVAL_P(the_data), Z_STRLEN_P(the_data), SEND_DATA);
UPD_STATIC_PROP(string, eTag, etag);
efree(etag);
}
- zval_dtor(&the_data);
+ zval_ptr_dtor(&the_data);
clean_ob = 1;
}
case SEND_DATA:
{
zval *zdata = GET_STATIC_PROP(data);
- RETURN_SUCCESS(http_send_data(Z_STRVAL_P(zdata), Z_STRLEN_P(zdata)));
+ RETURN_SUCCESS(http_send_data_ex(Z_STRVAL_P(zdata), Z_STRLEN_P(zdata), 1));
}
case SEND_RSRC:
zval *the_stream = GET_STATIC_PROP(stream);
the_stream->type = IS_RESOURCE;
php_stream_from_zval(the_real_stream, &the_stream);
- RETURN_SUCCESS(http_send_stream(the_real_stream));
+ RETURN_SUCCESS(http_send_stream_ex(the_real_stream, 0, 1));
}
default:
{
- RETURN_SUCCESS(http_send_file(Z_STRVAL_P(GET_STATIC_PROP(file))));
+ RETURN_SUCCESS(http_send_file_ex(Z_STRVAL_P(GET_STATIC_PROP(file)), 1));
}
}
}
* HttpResponse::setCache(true);
* HttpResponse::capture();
* // script follows
- * // note that you need to call
- * HttpResponse::send();
- * // at the end of the script unless
- * // you use PHP-5.1 or greater
* ?>
* </pre>
*/
php_end_ob_buffers(0 TSRMLS_CC);
php_start_ob_buffer(NULL, 0, 0 TSRMLS_CC);
-#if (PHP_MAJOR_VERSION > 5) || (PHP_MINOR_VERSION > 0)
+#ifndef WONKY
/* register shutdown function --
messing around with ob and headers only works in PHP-5.1 or greater */
{
}
/* }}} */
-#endif /* ZEND_ENGINE_2 */
+#endif /* ZEND_ENGINE_2 && !WONKY */
/*
* Local variables:
projects / m6w6 / ext-http / blobdiff