| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-2007, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-2010, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Invalid compression level (-1 to 9): %d", level); \
action; \
}
-
+#ifndef PHP_OUTPUT_NEWAPI
+# define HTTP_GET_OUTPUT_START() \
+ char *output_start_filename = php_get_output_start_filename(TSRMLS_C); \
+ int output_start_lineno = php_get_output_start_lineno(TSRMLS_C)
+#else
+# define HTTP_GET_OUTPUT_START() \
+ char *output_start_filename = php_output_get_start_filename(TSRMLS_C); \
+ int output_start_lineno = php_output_get_start_lineno(TSRMLS_C)
+#endif
#define HTTP_CHECK_HEADERS_SENT(action) \
if (SG(headers_sent) && !SG(request_info).no_headers) { \
- char *output_start_filename = php_get_output_start_filename(TSRMLS_C); \
- int output_start_lineno = php_get_output_start_lineno(TSRMLS_C); \
- \
+ HTTP_GET_OUTPUT_START(); \
if (output_start_filename) { \
http_error_ex(HE_WARNING, HTTP_E_HEADER, "Cannot modify header information - headers already sent by (output started at %s:%d)", \
output_start_filename, output_start_lineno); \
action; \
}
-#define HTTP_CHECK_OPEN_BASEDIR(file, act) \
- if ((PG(open_basedir) && *PG(open_basedir)) || PG(safe_mode)) \
- { \
- const char *tmp = file; \
- \
- if (!strncasecmp(tmp, "file:", lenof("file:"))) { \
- tmp += lenof("file:"); \
- while ((tmp - (const char *)file < 7) && (*tmp == '/' || *tmp == '\\')) ++tmp; \
- } \
- \
- if ( (tmp != file || !strstr(file, "://")) && \
- (!*tmp || php_check_open_basedir(tmp TSRMLS_CC) || \
- (PG(safe_mode) && !php_checkuid(tmp, "rb+", CHECKUID_CHECK_MODE_PARAM)))) { \
- act; \
- } \
- }
-
#define http_log(f, i, m) _http_log_ex((f), (i), (m) TSRMLS_CC)
extern void _http_log_ex(char *file, const char *ident, const char *message TSRMLS_DC);
#define http_zsep(t, z) _http_zsep_ex((t), (z), NULL)
#define http_zsep_ex(t, z, p) _http_zsep_ex((t), (z), (p))
static inline zval *_http_zsep_ex(int type, zval *z, zval **p) {
- SEPARATE_ARG_IF_REF(z);
+ Z_ADDREF_P(z);
if (Z_TYPE_P(z) != type) {
switch (type) {
case IS_NULL: convert_to_null_ex(&z); break;
case IS_ARRAY: convert_to_array_ex(&z); break;
case IS_OBJECT: convert_to_object_ex(&z); break;
}
+ } else {
+ SEPARATE_ZVAL_IF_NOT_REF(&z);
}
if (p) {
*p = z;