projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- improve libmagic support
[m6w6/ext-http]
/
http_api.c
diff --git
a/http_api.c
b/http_api.c
index e2019ad47a4a4de301b7bc0f0a902ab9e4e7b3b9..4e6942ad6ab1a466ac47eb738c3c93f48e75b706 100644
(file)
--- a/
http_api.c
+++ b/
http_api.c
@@
-37,6
+37,9
@@
#include <ctype.h>
#ifdef HTTP_HAVE_MAGIC
#include <ctype.h>
#ifdef HTTP_HAVE_MAGIC
+# if defined(PHP_WIN32) && !defined(USE_MAGIC_DLL)
+# define USE_MAGIC_STATIC
+# endif
# include <magic.h>
#endif
# include <magic.h>
#endif
@@
-164,21
+167,26
@@
STATUS _http_parse_key_list(const char *list, HashTable *items, char separator,
void _http_error_ex(long type, long code, const char *format, ...)
{
va_list args;
void _http_error_ex(long type, long code, const char *format, ...)
{
va_list args;
+ zend_bool throw_exception = 0;
TSRMLS_FETCH();
TSRMLS_FETCH();
- va_start(args, format);
if (type == E_THROW) {
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
#ifdef ZEND_ENGINE_2
+ if (throw_exception) {
char *message;
char *message;
+
vspprintf(&message, 0, format, args);
zend_throw_exception(http_exception_get_for_code(code), message, code TSRMLS_CC);
vspprintf(&message, 0, format, args);
zend_throw_exception(http_exception_get_for_code(code), message, code TSRMLS_CC);
-#else
- type = E_WARNING;
+ } else
#endif
#endif
- }
- if (type != E_THROW) {
- php_verror(NULL, "", type, format, args TSRMLS_CC);
- }
+ php_verror(NULL, "", type, format, args TSRMLS_CC);
va_end(args);
}
/* }}} */
va_end(args);
}
/* }}} */
@@
-393,13
+401,12
@@
PHP_HTTP_API char *_http_guess_content_type(const char *magicfile, long magicmod
if (ctype) {
ct = estrdup(ctype);
} else {
if (ctype) {
ct = estrdup(ctype);
} else {
- http_error(HE_WARNING, HTTP_E_RUNTIME, "Failed to guess Content-Type");
- }
-
- if (magic) {
- magic_close(magic);
+ http_error_ex(HE_WARNING, HTTP_E_RUNTIME, "Failed to guess Content-Type: %s", magic_error(magic));
}
}
}
}
+ if (magic) {
+ magic_close(magic);
+ }
#else
http_error(HE_WARNING, HTTP_E_RUNTIME, "Cannot guess Content-Type; libmagic not available");
#endif
#else
http_error(HE_WARNING, HTTP_E_RUNTIME, "Cannot guess Content-Type; libmagic not available");
#endif