You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ta...@apache.org on 2014/06/10 09:07:36 UTC

svn commit: r1601559 - /httpd/httpd/trunk/modules/filters/mod_proxy_html.c

Author: takashi
Date: Tue Jun 10 07:07:36 2014
New Revision: 1601559

URL: http://svn.apache.org/r1601559
Log:
follow up r1599012:
C99 fix

Modified:
    httpd/httpd/trunk/modules/filters/mod_proxy_html.c

Modified: httpd/httpd/trunk/modules/filters/mod_proxy_html.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_proxy_html.c?rev=1601559&r1=1601558&r2=1601559&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_proxy_html.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_proxy_html.c Tue Jun 10 07:07:36 2014
@@ -918,6 +918,8 @@ static apr_status_t proxy_html_filter(ap
         else if (apr_bucket_read(b, &buf, &bytes, APR_BLOCK_READ)
                  == APR_SUCCESS) {
             if (ctxt->parser == NULL) {
+                const char *cenc;
+
                 /* For documents smaller than four bytes, there is no reason to do
                  * HTML rewriting. The URL schema (i.e. 'http') needs four bytes alone.
                  * And the HTML parser needs at least four bytes to initialise correctly.
@@ -927,7 +929,6 @@ static apr_status_t proxy_html_filter(ap
                     return ap_pass_brigade(f->next, bb) ;
                 }
 
-                const char *cenc;
                 if (!xml2enc_charset ||
                     (xml2enc_charset(f->r, &enc, &cenc) != APR_SUCCESS)) {
                     if (!xml2enc_charset)