svn commit: r881457 - in /jakarta/jmeter/trunk: src/core/org/apache/jmeter/resources/messages.properties xdocs/usermanual/component_reference.xml

[se...@apache.org]

Author: sebb
Date: Tue Nov 17 19:41:36 2009
New Revision: 881457

URL: http://svn.apache.org/viewvc?rev=881457&view=rev
Log:
Better docn of Cache-Control

Modified:
    jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
    jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml

Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=881457&r1=881456&r2=881457&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Tue Nov 17 19:41:36 2009
@@ -865,7 +865,7 @@
 url_config_title=HTTP Request Defaults
 url_full_config_title=UrlFull Sample
 url_multipart_config_title=HTTP Multipart Request Defaults
-use_expires=Use Expires header when processing GET requests
+use_expires=Use Cache-Control/Expires header when processing GET requests
 use_keepalive=Use KeepAlive
 use_multipart_for_http_post=Use multipart/form-data for HTTP POST
 use_recording_controller=Use Recording Controller

Modified: jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=881457&r1=881456&r2=881457&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml (original)
+++ jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml Tue Nov 17 19:41:36 2009
@@ -2684,9 +2684,10 @@
 and if so, the If-Last-Modified and If-None-Match conditional headers are set for the request.
 </p>
 <p>
-Additionally, if the "Use Expires header" option is selected, then the Expires value is checked against the current time.
+Additionally, if the "Use Cache-Control/Expires header" option is selected, then the Cache-Control/Expires value is checked against the current time.
 If the request is a GET request, and the timestamp is in the future, then the sampler returns immediately,
 without requesting the URL from the remote server. This is intended to emulate browser behaviour.
+Note that the Cache-Control header must be "public" and only the "max-age" expiry option is processed.
 </p>
 <p>
 If the requested document has not changed since it was cached, then the response body will be empty.



---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org