This is an automated email from the ASF dual-hosted git repository.
git-site-role pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/struts-site.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 7729eb3 Updates production by Jenkins
7729eb3 is described below
commit 7729eb3cdf3b95d8cc7ee6e597d0eeed324d503b
Author: jenkins <bui...@apache.org>
AuthorDate: Thu Nov 23 18:42:51 2017 +0000
Updates production by Jenkins
---
content/core-developers/file-upload.html | 21 +++------------------
content/tag-developers/velocity.html | 7 +------
2 files changed, 4 insertions(+), 24 deletions(-)
diff --git a/content/core-developers/file-upload.html
b/content/core-developers/file-upload.html
index a584715..0db1c5b 100644
--- a/content/core-developers/file-upload.html
+++ b/content/core-developers/file-upload.html
@@ -422,12 +422,7 @@
<h2 id="advanced-configuration">Advanced Configuration</h2>
-<p>The Struts 2</p>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>default.properties
-</code></pre>
-</div>
-<p>file defines several settings that affect the behavior of file uploading.
You may find in necessary to change these values. The names and default values
are:</p>
+<p>The Struts 2 <code class="highlighter-rouge">default.properties</code> file
defines several settings that affect the behavior of file uploading. You may
find in necessary to change these values. The names and default values are:</p>
<div class="highlighter-rouge"><pre
class="highlight"><code>struts.multipart.parser=jakarta
struts.multipart.saveDir=
@@ -483,12 +478,7 @@ struts.multipart.maxSize=2097152
<p><strong>File Size Limits</strong></p>
-<p>There are two separate file size limits. First is <code
class="highlighter-rouge">struts.multipart.maxSize</code> which comes from the
Struts 2</p>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>default.properties
-</code></pre>
-</div>
-<p>file. This setting exists for security reasons to prohibit a malicious user
from uploading extremely large files to file up your servers disk space. This
setting defaults to approximately 2 megabytes and should be adjusted to the
maximum size file (2 gigs max) that your will need the framework to receive. If
you are uploading more than one file on a form the <code
class="highlighter-rouge">struts.multipart.maxSize</code> applies to the
combined total, not the individual file sizes. Th [...]
+<p>There are two separate file size limits. First is <code
class="highlighter-rouge">struts.multipart.maxSize</code> which comes from the
Struts 2 <code class="highlighter-rouge">default.properties</code> file. This
setting exists for security reasons to prohibit a malicious user from uploading
extremely large files to file up your servers disk space. This setting defaults
to approximately 2 megabytes and should be adjusted to the maximum size file (2
gigs max) that your will need the fr [...]
<div class="highlighter-rouge"><pre class="highlight"><code>maximumSize
</code></pre>
@@ -578,12 +568,7 @@ struts.multipart.maxSize=2097152
<p><strong>Temporary Directories</strong></p>
-<p>All uploaded files are saved to a temporary directory by the framework
before being passed in to an Action. Depending on the allowed file sizes it may
be necessary to have the framework store these temporary files in an alternate
location. To do this change <code
class="highlighter-rouge">struts.multipart.saveDir</code> to the directory
where the uploaded files will be placed. If this property is not set it
defaults to <code class="highlighter-rouge">javax.servlet.context.tempdir</cod
[...]
-
-<div class="highlighter-rouge"><pre class="highlight"><code>/tmp
-</code></pre>
-</div>
-<p>is memory based and files stored in that directory would consume an amount
of RAM approximately equal to the size of the uploaded file.</p>
+<p>All uploaded files are saved to a temporary directory by the framework
before being passed in to an Action. Depending on the allowed file sizes it may
be necessary to have the framework store these temporary files in an alternate
location. To do this change <code
class="highlighter-rouge">struts.multipart.saveDir</code> to the directory
where the uploaded files will be placed. If this property is not set it
defaults to <code class="highlighter-rouge">javax.servlet.context.tempdir</cod
[...]
<p><strong>Alternate Libraries</strong></p>
diff --git a/content/tag-developers/velocity.html
b/content/tag-developers/velocity.html
index 9de9518..3d11de5 100644
--- a/content/tag-developers/velocity.html
+++ b/content/tag-developers/velocity.html
@@ -229,12 +229,7 @@ Hello, ${name}
</li>
</ol>
-<p>Since the action context is resolved after the value stack, you can
reference the variable without the typical preceding marker (#) that has to be
used with the JSP</p>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>s:property
-</code></pre>
-</div>
-<p>tag. Omitting the marker can be convenient, but it can also trip you up, if
used carelessly.</p>
+<p>Since the action context is resolved after the value stack, you can
reference the variable without the typical preceding marker (#) that has to be
used with the JSP <code class="highlighter-rouge">s:property</code> tag.
Omitting the marker can be convenient, but it can also trip you up, if used
carelessly.</p>
<div class="highlighter-rouge"><pre class="highlight"><code>
#surl "id=url" "value=http://www.yahoo.com";
--
To stop receiving notification emails like this one, please contact
['"commits@struts.apache.org" <commits@struts.apache.org>'].
