#include <ctype.h>
#ifdef HTTP_HAVE_MAGIC
-# if defined(PHP_WIN32) && !defined(USE_MAGIC_DLL)
+# if defined(PHP_WIN32) && !defined(USE_MAGIC_DLL) && !defined(USE_MAGIC_STATIC)
# define USE_MAGIC_STATIC
# endif
# include <magic.h>
/* }}} */
/* {{{ void http_error(long, long, char*) */
-void _http_error_ex(long type, long code, const char *format, ...)
+void _http_error_ex(long type TSRMLS_DC, long code, const char *format, ...)
{
va_list args;
- zend_bool throw_exception = 0;
- TSRMLS_FETCH();
-
- if (type == E_THROW) {
- throw_exception = 1;
- type = E_WARNING;
- } else if (PG(error_handling) == EH_THROW) {
- throw_exception = 1;
- }
-
+
va_start(args, format);
#ifdef ZEND_ENGINE_2
- if (throw_exception) {
+ if ((type == E_THROW) || (PG(error_handling) == EH_THROW)) {
char *message;
vspprintf(&message, 0, format, args);
php_stream *log = php_stream_open_wrapper(file, "ab", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL); \
\
if (log) { \
- php_stream_printf(log TSRMLS_CC, "%s [%12s] %32s <%s>%s", datetime, type, msg, SG(request_info).request_uri, PHP_EOL); \
+ php_stream_printf(log TSRMLS_CC, "%s\t[%s]\t%s\t<%s>%s", datetime, type, msg, SG(request_info).request_uri, PHP_EOL); \
php_stream_close(log); \
} \
\