diff options
| author | foobar <sniper@php.net> | 2002-07-12 01:49:58 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2002-07-12 01:49:58 +0000 |
| commit | ed58d3a235883fc56d84499fab7b5b02d69a704e (patch) | |
| tree | 60d13bdd982d32516bf6b3e3748b263d4b97dfe9 | |
| parent | 87e0a4baf5f674b2276833ff0a4ca42f13bd621e (diff) | |
| download | php-git-ed58d3a235883fc56d84499fab7b5b02d69a704e.tar.gz | |
- Added predefined constants for the upload errors.
- Removed the debugging error (not useful for end-users)
| -rw-r--r-- | main/main.c | 2 | ||||
| -rw-r--r-- | main/rfc1867.c | 21 | ||||
| -rw-r--r-- | main/rfc1867.h | 1 |
3 files changed, 18 insertions, 6 deletions
diff --git a/main/main.c b/main/main.c index b406d684c8..8d14b99f99 100644 --- a/main/main.c +++ b/main/main.c @@ -80,6 +80,7 @@ #endif /* defined(ZEND_MULTIBYTE) && defined(HAVE_MBSTRING) */ #include "SAPI.h" +#include "rfc1867.h" /* }}} */ #ifndef ZTS @@ -973,6 +974,7 @@ int php_module_startup(sapi_module_struct *sf) REGISTER_MAIN_STRINGL_CONSTANT("PHP_CONFIG_FILE_PATH", PHP_CONFIG_FILE_PATH, sizeof(PHP_CONFIG_FILE_PATH)-1, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_STRINGL_CONSTANT("PHP_SHLIB_SUFFIX", PHP_SHLIB_SUFFIX, sizeof(PHP_SHLIB_SUFFIX)-1, CONST_PERSISTENT | CONST_CS); php_output_register_constants(TSRMLS_C); + php_rfc1867_register_constants(TSRMLS_C); if (php_startup_ticks(TSRMLS_C) == FAILURE) { php_printf("Unable to start PHP ticks\n"); diff --git a/main/rfc1867.c b/main/rfc1867.c index 62073799f1..5c52c8ebf0 100644 --- a/main/rfc1867.c +++ b/main/rfc1867.c @@ -55,11 +55,20 @@ #define MAX_SIZE_OF_INDEX sizeof("[tmp_name]") /* Errors */ -#define UPLOAD_ERROR_A 1 /* Uploaded file exceeded upload_max_filesize */ -#define UPLOAD_ERROR_B 2 /* Uploaded file exceeded MAX_FILE_SIZE */ -#define UPLOAD_ERROR_C 3 /* Only partiallly uploaded */ -#define UPLOAD_ERROR_D 4 /* No file uploaded */ -#define UPLOAD_ERROR_E 5 /* Uploaded file size 0 bytes */ +#define UPLOAD_ERROR_OK 0 /* File upload succesful */ +#define UPLOAD_ERROR_A 1 /* Uploaded file exceeded upload_max_filesize */ +#define UPLOAD_ERROR_B 2 /* Uploaded file exceeded MAX_FILE_SIZE */ +#define UPLOAD_ERROR_C 3 /* Partially uploaded */ +#define UPLOAD_ERROR_D 4 /* No file uploaded */ + +void php_rfc1867_register_constants(TSRMLS_D) +{ + REGISTER_MAIN_LONG_CONSTANT("UPLOAD_ERR_OK", UPLOAD_ERROR_OK, CONST_CS | CONST_PERSISTENT); + REGISTER_MAIN_LONG_CONSTANT("UPLOAD_ERR_INI_SIZE", UPLOAD_ERROR_A, CONST_CS | CONST_PERSISTENT); + REGISTER_MAIN_LONG_CONSTANT("UPLOAD_ERR_FORM_SIZE", UPLOAD_ERROR_B, CONST_CS | CONST_PERSISTENT); + REGISTER_MAIN_LONG_CONSTANT("UPLOAD_ERR_PARTIAL", UPLOAD_ERROR_C, CONST_CS | CONST_PERSISTENT); + REGISTER_MAIN_LONG_CONSTANT("UPLOAD_ERR_NO_FILE", UPLOAD_ERROR_D, CONST_CS | CONST_PERSISTENT); +} static void add_protected_variable(char *varname TSRMLS_DC) { @@ -788,7 +797,7 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler) #ifdef DEBUG_FILE_UPLOAD if(strlen(filename) > 0 && total_bytes == 0) { sapi_module.sapi_error(E_WARNING, "Uploaded file size 0 - file [%s=%s] not saved", param, filename); - cancel_upload = UPLOAD_ERROR_E; + cancel_upload = 5; } #endif diff --git a/main/rfc1867.h b/main/rfc1867.h index 5d93ab4b11..40b8fd580e 100644 --- a/main/rfc1867.h +++ b/main/rfc1867.h @@ -8,5 +8,6 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler); void destroy_uploaded_files_hash(TSRMLS_D); +void php_rfc1867_register_constants(TSRMLS_D); #endif /* RFC1867_H */ |