Merge branch 'story/105754990-file-upload' into staging

This commit is contained in:
Vladimir Krylov 2015-10-28 12:52:46 +02:00
commit 3d8450ad7b
5 changed files with 5 additions and 1 deletions

View file

@ -8,5 +8,6 @@
.form-group
.col-md-3.control-label
= f.label :legal_document, t(:legal_document)
%p.help-block= t(:legal_document_max_size)
.col-md-7
= f.file_field :legal_document, :value => ''

View file

@ -16,6 +16,7 @@
.col-md-3.control-label
- c, fr = 'required', true if params[:domain_name].blank?
= label_tag 'domain[legal_document]', t(:legal_document), class: c
%p.help-block= t(:legal_document_max_size)
.col-md-7
= file_field_tag 'domain[legal_document]', required: fr
.col-md-4

View file

@ -9,6 +9,7 @@
.form-group
.col-md-4.control-label
= label_tag 'domain[legal_document]', t(:legal_document), class: 'required'
%p.help-block= t(:legal_document_max_size)
.col-md-6
= file_field_tag 'domain[legal_document]', required: true
= hidden_field_tag 'domain[name]', params[:domain_name]

View file

@ -633,6 +633,7 @@ en:
expiry_absolute: 'Expiry absolute'
upload_key: 'Upload key'
legal_document: 'Legal document'
legal_document_max_size: '(max. 8MB)'
delete_domain: 'Delete domain'
index: 'Index'
ident: 'Ident'

View file

@ -5,7 +5,7 @@
#define EPP_TCP_HEADER_SIZE 4 /* just one longword */
-#define EPP_MAX_FRAME_SIZE 65536 /* don't accept larger xml data blocks */
+#define EPP_MAX_FRAME_SIZE 8388608 /* don't accept larger xml data blocks */
+#define EPP_MAX_FRAME_SIZE 15728640 /* don't accept larger xml data blocks (8MB + 30% base64 + xml + savings)*/
#define TRIDSIZE 128 /* actually, it should be 3 to 64 chars,
but due to unicode we'll give it more room. */