projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag 'RELEASE_0_13_0'.
[m6w6/ext-http]
/
http_api.c
diff --git
a/http_api.c
b/http_api.c
index 4e6942ad6ab1a466ac47eb738c3c93f48e75b706..f59a7d0a75cf2d7fd7561b624d2068ff9406d840 100644
(file)
--- a/
http_api.c
+++ b/
http_api.c
@@
-37,7
+37,7
@@
#include <ctype.h>
#ifdef HTTP_HAVE_MAGIC
#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>
# define USE_MAGIC_STATIC
# endif
# include <magic.h>
@@
-164,22
+164,13
@@
STATUS _http_parse_key_list(const char *list, HashTable *items, char separator,
/* }}} */
/* {{{ void http_error(long, long, char*) */
/* }}} */
/* {{{ 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;
{
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
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);
char *message;
vspprintf(&message, 0, format, args);
@@
-206,7
+197,7
@@
void _http_log_ex(char *file, const char *ident, const char *message TSRMLS_DC)
php_stream *log = php_stream_open_wrapper(file, "ab", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL); \
\
if (log) { \
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); \
} \
\
php_stream_close(log); \
} \
\