Merged changes from version 2.0.7

scottk212 · Oct 28, 2008 · 7b7f947 · 7b7f947
1 parent daa8386
commit 7b7f947
Show file tree

Hide file tree

Showing 3 changed files with 166 additions and 33 deletions.
diff --git a/Changelog b/Changelog
@@ -1,4 +1,10 @@
 
+Version 2.1.1
+ * Change: file size and output body size restrictions
+ * Added feature: directive upload_pass_args enables forwarding
+   of request arguments to a backend. Thanks to Todd Fisher.
+ * Added feature: guessing of file's content type via file extension
+
 Version 2.1.0
  * Added feature: upload filters, unzip and discarding filter
  * Added feature: guessing content type using file extensions

diff --git a/ngx_http_upload.h b/ngx_http_upload.h
@@ -38,6 +38,7 @@
 #define NGX_UPLOAD_NOMEM        -2
 #define NGX_UPLOAD_IOERROR      -3
 #define NGX_UPLOAD_SCRIPTERROR  -4
+#define NGX_UPLOAD_TOOLARGE     -5
 
 /*
  * State of multipart/form-data parser
@@ -120,13 +121,17 @@ typedef struct ngx_http_upload_loc_conf_s {
     ngx_uint_t        store_access;
     size_t            buffer_size;
     size_t            max_header_len;
+    size_t            max_output_body_len;
+    off_t             max_file_size;
     ngx_array_t       *field_templates;
     ngx_array_t       *aggregate_field_templates;
     ngx_array_t       *field_filters;
     ngx_array_t       *cleanup_statuses;
+    ngx_flag_t         forward_args;
 
     ngx_array_t       *content_filters;
     ngx_array_t       *content_type_map;
+    ngx_array_t       *void_content_types;
 
     ngx_str_t         archive_elm_separator;
     ngx_str_t         archive_path_separator;