From: Rich Bowen <rbowen@apache.org>
Date: Fri, 15 Apr 2011 20:17:38 +0000 (+0000)
Subject: via Matthew Sporleder - the domain argument is required in the CO flag,
X-Git-Tag: 2.2.18~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=15e55826d2c8a6b6defe05ce811ca508649ed32d;p=thirdparty%2Fapache%2Fhttpd.git

via Matthew Sporleder - the domain argument is required in the CO flag,
or the cookie doesn't get set.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1092802 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/misc/rewriteguide.xml.ko b/docs/manual/misc/rewriteguide.xml.ko
index 2f9ddea66c6..92ed15f6eb0 100644
--- a/docs/manual/misc/rewriteguide.xml.ko
+++ b/docs/manual/misc/rewriteguide.xml.ko
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="EUC-KR" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 122770:805050 (outdated) -->
+<!-- English Revision: 122770:1090789 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_rewrite.html.en b/docs/manual/mod/mod_rewrite.html.en
index d72297c9685..17e26d4a25a 100644
--- a/docs/manual/mod/mod_rewrite.html.en
+++ b/docs/manual/mod/mod_rewrite.html.en
@@ -1311,7 +1311,7 @@ cannot use <code>$N</code> in the substitution string!
     <tr>
         <td>cookie|CO=<em>NAME</em>:<em>VAL</em></td>
         <td>Sets a cookie in the client browser. Full syntax is: 
-        CO=<em>NAME</em>:<em>VAL</em>[:<em>domain</em>[:<em>lifetime</em>[:<em>path</em>[:<em>secure</em>[:<em>httponly</em>]]]]] <em><a href="../rewrite/flags.html#flag_co">details ...</a></em>
+        CO=<em>NAME</em>:<em>VAL</em>:<em>domain</em>[:<em>lifetime</em>[:<em>path</em>[:<em>secure</em>[:<em>httponly</em>]]]] <em><a href="../rewrite/flags.html#flag_co">details ...</a></em>
         </td>
     </tr>
     <tr>
diff --git a/docs/manual/mod/mod_rewrite.xml b/docs/manual/mod/mod_rewrite.xml
index a11f4fbc9ff..63e7337da3d 100644
--- a/docs/manual/mod/mod_rewrite.xml
+++ b/docs/manual/mod/mod_rewrite.xml
@@ -1331,7 +1331,7 @@ cannot use <code>$N</code> in the substitution string!
     <tr>
         <td>cookie|CO=<em>NAME</em>:<em>VAL</em></td>
         <td>Sets a cookie in the client browser. Full syntax is: 
-        CO=<em>NAME</em>:<em>VAL</em>[:<em>domain</em>[:<em>lifetime</em>[:<em>path</em>[:<em>secure</em>[:<em>httponly</em>]]]]] <em><a href="../rewrite/flags.html#flag_co">details ...</a></em>
+        CO=<em>NAME</em>:<em>VAL</em>:<em>domain</em>[:<em>lifetime</em>[:<em>path</em>[:<em>secure</em>[:<em>httponly</em>]]]] <em><a href="../rewrite/flags.html#flag_co">details ...</a></em>
         </td>
     </tr>
     <tr>
diff --git a/docs/manual/rewrite/flags.html.en b/docs/manual/rewrite/flags.html.en
index 4d22a5a4e45..0e16b2d1c0b 100644
--- a/docs/manual/rewrite/flags.html.en
+++ b/docs/manual/rewrite/flags.html.en
@@ -113,19 +113,17 @@ skipped.</p>
 <h2><a name="flag_co" id="flag_co">CO|cookie</a></h2>
 <p>The [CO], or [cookie] flag, allows you to set a cookie when a
 particular <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code>
-matches. The argument consists of three required fields and five optional
+matches. The argument consists of three required fields and four optional
 fields.</p>
 
 <p>The full syntax for the flag, including all attributes, is as
 follows:</p>
 
 <div class="example"><p><code>
-[CO=NAME:VALUE:domain:lifetime:path:secure:httponly]
+[CO=NAME:VALUE:DOMAIN:lifetime:path:secure:httponly]
 </code></p></div>
 
-<p>You must declare a name and value for the cookie to be set.</p>
-
-<p>You may optionally also set the following values:</p>
+<p>You must declare a name, a value, and a domain for the cookie to be set.</p>
 
 <dl>
 <dt>Domain</dt>
@@ -135,7 +133,11 @@ such as <code>.example.com</code>. It must be at least two parts
 separated by a dot. That is, it may not be merely <code>.com</code> or
 <code>.net</code>. Cookies of that kind are forbidden by the cookie
 security model.</dd>
-<dd>The default value for the domain is the current domain.</dd>
+</dl>
+
+<p>You may optionally also set the following values:</p>
+
+<dl>
 
 <dt>Lifetime</dt>
 <dd>The time for which the cookie will persist, in minutes.</dd>
diff --git a/docs/manual/rewrite/flags.xml b/docs/manual/rewrite/flags.xml
index 89052788e1f..79b5c3e0e9b 100644
--- a/docs/manual/rewrite/flags.xml
+++ b/docs/manual/rewrite/flags.xml
@@ -107,19 +107,17 @@ skipped.</p>
 <section id="flag_co"><title>CO|cookie</title>
 <p>The [CO], or [cookie] flag, allows you to set a cookie when a
 particular <directive module="mod_rewrite">RewriteRule</directive>
-matches. The argument consists of three required fields and five optional
+matches. The argument consists of three required fields and four optional
 fields.</p>
 
 <p>The full syntax for the flag, including all attributes, is as
 follows:</p>
 
 <example>
-[CO=NAME:VALUE:domain:lifetime:path:secure:httponly]
+[CO=NAME:VALUE:DOMAIN:lifetime:path:secure:httponly]
 </example>
 
-<p>You must declare a name and value for the cookie to be set.</p>
-
-<p>You may optionally also set the following values:</p>
+<p>You must declare a name, a value, and a domain for the cookie to be set.</p>
 
 <dl>
 <dt>Domain</dt>
@@ -129,7 +127,11 @@ such as <code>.example.com</code>. It must be at least two parts
 separated by a dot. That is, it may not be merely <code>.com</code> or
 <code>.net</code>. Cookies of that kind are forbidden by the cookie
 security model.</dd>
-<dd>The default value for the domain is the current domain.</dd>
+</dl>
+
+<p>You may optionally also set the following values:</p>
+
+<dl>
 
 <dt>Lifetime</dt>
 <dd>The time for which the cookie will persist, in minutes.</dd>