diff options
| author | Ben Fuhrmannek | 2021-02-16 11:16:59 +0100 |
|---|---|---|
| committer | Ben Fuhrmannek | 2021-02-16 11:16:59 +0100 |
| commit | 5484bcb5eb2714e7438927e2566c86a74d7c51af (patch) | |
| tree | b78326d2999397be4c08e06b23209981f82a4ea9 /src/sp_upload_validation.c | |
| parent | 7ac1e3866ef4f146c6c93a5ca13b9aebb14e936a (diff) | |
| parent | cecfdd808da67be908dbe7144cc8c74dfb3f855e (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/sp_upload_validation.c')
| -rw-r--r-- | src/sp_upload_validation.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/sp_upload_validation.c b/src/sp_upload_validation.c index 54b0481..f3ae311 100644 --- a/src/sp_upload_validation.c +++ b/src/sp_upload_validation.c | |||
| @@ -13,10 +13,11 @@ int sp_rfc1867_callback(unsigned int event, void *event_data, void **extra); | |||
| 13 | 13 | ||
| 14 | int sp_rfc1867_callback_win(unsigned int event, void *event_data, | 14 | int sp_rfc1867_callback_win(unsigned int event, void *event_data, |
| 15 | void **extra) { | 15 | void **extra) { |
| 16 | sp_log_msg("upload_validation", SP_LOG_SIMULATION, | 16 | sp_log_simulation( |
| 17 | "The upload validation doesn't work for now on Windows yet, " | 17 | "upload_validation", |
| 18 | "see https://github.com/jvoisin/snuffleupagus/issues/248 for " | 18 | "The upload validation doesn't work for now on Windows yet, " |
| 19 | "details."); | 19 | "see https://github.com/jvoisin/snuffleupagus/issues/248 for " |
| 20 | "details."); | ||
| 20 | return SUCCESS; | 21 | return SUCCESS; |
| 21 | } | 22 | } |
| 22 | 23 | ||
| @@ -90,9 +91,9 @@ int sp_rfc1867_callback(unsigned int event, void *event_data, void **extra) { | |||
| 90 | if (WEXITSTATUS(waitstatus) != 0) { // Nope | 91 | if (WEXITSTATUS(waitstatus) != 0) { // Nope |
| 91 | char *uri = getenv("REQUEST_URI"); | 92 | char *uri = getenv("REQUEST_URI"); |
| 92 | int sim = config_upload->simulation; | 93 | int sim = config_upload->simulation; |
| 93 | sp_log_msg("upload_validation", sim ? SP_LOG_SIMULATION : SP_LOG_DROP, | 94 | sp_log_auto("upload_validation", sim, |
| 94 | "The upload of %s on %s was rejected.", filename, | 95 | "The upload of %s on %s was rejected.", filename, |
| 95 | uri ? uri : "?"); | 96 | uri ? uri : "?"); |
| 96 | } | 97 | } |
| 97 | } | 98 | } |
| 98 | ZEND_HASH_FOREACH_END(); | 99 | ZEND_HASH_FOREACH_END(); |
