You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by je...@apache.org on 2002/11/10 07:09:20 UTC
cvs commit: httpd-2.0/modules/filters mod_deflate.c
jerenkrantz 2002/11/09 22:09:20
Modified: . CHANGES
modules/filters mod_deflate.c
Log:
Always emit Vary header if mod_deflate is involved in the request.
Submitted by: AndréMalo <nd...@perlig.de>
Reviewed by: Justin Erenkrantz
Revision Changes Path
1.975 +3 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.974
retrieving revision 1.975
diff -u -u -r1.974 -r1.975
--- CHANGES 9 Nov 2002 19:21:29 -0000 1.974
+++ CHANGES 10 Nov 2002 06:09:19 -0000 1.975
@@ -1,5 +1,8 @@
Changes with Apache 2.0.44
+ *) Always emit Vary header if mod_deflate is involved in the
+ request. [AndréMalo <nd...@perlig.de>]
+
*) mod_isapi: Stop unsetting the 'empty' query string result with
a NULL argument in ecb->lpszQueryString, eliminating segfaults
for some ISAPI modules. PR 14399
1.25 +6 -1 httpd-2.0/modules/filters/mod_deflate.c
Index: mod_deflate.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/filters/mod_deflate.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -u -r1.24 -r1.25
--- mod_deflate.c 30 Aug 2002 16:31:17 -0000 1.24
+++ mod_deflate.c 10 Nov 2002 06:09:20 -0000 1.25
@@ -306,6 +306,12 @@
}
}
+ /* Even if we don't accept this request based on it not having
+ * the Accept-Encoding, we need to note that we were looking
+ * for this header and downstream proxies should be aware of that.
+ */
+ apr_table_setn(r->headers_out, "Vary", "Accept-Encoding");
+
/* if they don't have the line, then they can't play */
accepts = apr_table_get(r->headers_in, "Accept-Encoding");
if (accepts == NULL) {
@@ -369,7 +375,6 @@
else {
apr_table_mergen(r->headers_out, "Content-Encoding", "gzip");
}
- apr_table_setn(r->headers_out, "Vary", "Accept-Encoding");
apr_table_unset(r->headers_out, "Content-Length");
/* initialize deflate output buffer */
Re: cvs commit: httpd-2.0/modules/filters mod_deflate.c
Posted by André Malo <nd...@perlig.de>.
* Justin Erenkrantz wrote:
> André, how do you want your name reflected in the CHANGES file?
you may simply drop the eh... accent (?).
> (Sending a patch would probably be best so I don't screw it up
> anymore...)
hehe, done.
nd
--
sub the($){+shift} sub answer (){ord q
[* It is always 42! *] }
print the answer
# André Malo # http://www.perlig.de/ #
Re: cvs commit: httpd-2.0/modules/filters mod_deflate.c
Posted by Aaron Bannert <aa...@clove.org>.
On Sat, Nov 09, 2002 at 10:17:58PM -0800, Justin Erenkrantz wrote:
> Oh, bah. I'm getting used to a certain SCM that supports UTF-8
> (heck, I'm not even sure if that got inputed as UTF-8 either). My
> bad.
Did you edit that file in your SCM? How did you input that anyway?
What kind of encoding is valid for our CHANGES file (I'm really out
of my league here, but I'd be happy if someone could point my sorry
sheltered US-keyboard-centric self in the right direction here).
> André, how do you want your name reflected in the CHANGES file?
> (Sending a patch would probably be best so I don't screw it up
> anymore...) -- justin
I just took out the accent, but it would be cool someone could
tell me how to make it work with accents. :)
-aaron
Re: cvs commit: httpd-2.0/modules/filters mod_deflate.c
Posted by Justin Erenkrantz <je...@apache.org>.
--On Sunday, November 10, 2002 6:09 AM +0000 jerenkrantz@apache.org
wrote:
> jerenkrantz 2002/11/09 22:09:20
>
> Modified: . CHANGES
> modules/filters mod_deflate.c
> Log:
> Always emit Vary header if mod_deflate is involved in the request.
>
> Submitted by: Andr?©Malo <nd...@perlig.de>
> Reviewed by: Justin Erenkrantz
Oh, bah. I'm getting used to a certain SCM that supports UTF-8
(heck, I'm not even sure if that got inputed as UTF-8 either). My
bad.
André, how do you want your name reflected in the CHANGES file?
(Sending a patch would probably be best so I don't screw it up
anymore...) -- justin
Re: cvs commit: httpd-2.0/modules/filters mod_deflate.c
Posted by André Malo <nd...@perlig.de>.
* Rasmus Lerdorf wrote:
> Shouldn't you also Vary on User-Agent when a BrowserMatch no-gzip is
> present?
Yes, but mod_deflate doesn't know anything about BrowserMatch. So one has
to configure an explicit
Header append Vary User-Agent
in that case (no-gzip can be set in various ways, not only with
BrowserMatch). In fact, I was only extending the docs a little bit, see
<http://cvs.apache.org/~nd/manual/mod/mod_deflate.html> ;-)
nd
--
"Eine Eieruhr", erklärt ihr Hermann, "besteht aus einem Ei. Du nimmst
das Ei und kochst es. Wenn es hart ist, sind fünf Minuten um. Dann weißt
du, daß die Zeit vergangen ist."
-- Hannes Hüttner in "Das Blaue vom Himmel"
Re: cvs commit: httpd-2.0/modules/filters mod_deflate.c
Posted by Rasmus Lerdorf <ra...@apache.org>.
Shouldn't you also Vary on User-Agent when a BrowserMatch no-gzip is
present?
On 10 Nov 2002 jerenkrantz@apache.org wrote:
> jerenkrantz 2002/11/09 22:09:20
>
> Modified: . CHANGES
> modules/filters mod_deflate.c
> Log:
> Always emit Vary header if mod_deflate is involved in the request.
>
> Submitted by: AndréMalo <nd...@perlig.de>
> Reviewed by: Justin Erenkrantz
>
> Revision Changes Path
> 1.975 +3 -0 httpd-2.0/CHANGES
>
> Index: CHANGES
> ===================================================================
> RCS file: /home/cvs/httpd-2.0/CHANGES,v
> retrieving revision 1.974
> retrieving revision 1.975
> diff -u -u -r1.974 -r1.975
> --- CHANGES 9 Nov 2002 19:21:29 -0000 1.974
> +++ CHANGES 10 Nov 2002 06:09:19 -0000 1.975
> @@ -1,5 +1,8 @@
> Changes with Apache 2.0.44
>
> + *) Always emit Vary header if mod_deflate is involved in the
> + request. [AndréMalo <nd...@perlig.de>]
> +
> *) mod_isapi: Stop unsetting the 'empty' query string result with
> a NULL argument in ecb->lpszQueryString, eliminating segfaults
> for some ISAPI modules. PR 14399
>
>
>
> 1.25 +6 -1 httpd-2.0/modules/filters/mod_deflate.c
>
> Index: mod_deflate.c
> ===================================================================
> RCS file: /home/cvs/httpd-2.0/modules/filters/mod_deflate.c,v
> retrieving revision 1.24
> retrieving revision 1.25
> diff -u -u -r1.24 -r1.25
> --- mod_deflate.c 30 Aug 2002 16:31:17 -0000 1.24
> +++ mod_deflate.c 10 Nov 2002 06:09:20 -0000 1.25
> @@ -306,6 +306,12 @@
> }
> }
>
> + /* Even if we don't accept this request based on it not having
> + * the Accept-Encoding, we need to note that we were looking
> + * for this header and downstream proxies should be aware of that.
> + */
> + apr_table_setn(r->headers_out, "Vary", "Accept-Encoding");
> +
> /* if they don't have the line, then they can't play */
> accepts = apr_table_get(r->headers_in, "Accept-Encoding");
> if (accepts == NULL) {
> @@ -369,7 +375,6 @@
> else {
> apr_table_mergen(r->headers_out, "Content-Encoding", "gzip");
> }
> - apr_table_setn(r->headers_out, "Vary", "Accept-Encoding");
> apr_table_unset(r->headers_out, "Content-Length");
>
> /* initialize deflate output buffer */
>
>
>
>