svn commit: r1879111 - /httpd/httpd/trunk/modules/proxy/mod_proxy.c

[yl...@apache.org]

Author: ylavic
Date: Tue Jun 23 10:23:59 2020
New Revision: 1879111

URL: http://svn.apache.org/viewvc?rev=1879111&view=rev
Log:
Follow up to r1879110: avoid signed comparison for use_original_uri.

And fix comment about default value.

Modified:
    httpd/httpd/trunk/modules/proxy/mod_proxy.c

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy.c?rev=1879111&r1=1879110&r2=1879111&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy.c Tue Jun 23 10:23:59 2020
@@ -936,7 +936,7 @@ PROXY_DECLARE(int) ap_proxy_trans_match(
          * might consider for instance that an original %3B is a delimiter
          * for path parameters (which is not).
          */
-        if (dconf->use_original_uri > 0
+        if (dconf->use_original_uri == 1
                 && (ent->flags & PROXYPASS_MAPPING_SERVLET)) {
             nocanon = 0; /* ignored since servlet's normalization applies */
             len = alias_match_servlet(r->pool, r->uri, fake);
@@ -1020,9 +1020,9 @@ static int proxy_trans(request_rec *r, i
     dconf = ap_get_module_config(r->per_dir_config, &proxy_module);
 
     /* Do the work from the hook corresponding to the ProxyUseOriginalURI
-     * configuration (on/default: translate hook, off: pre_translate hook).
+     * configuration (off/default: translate hook, on: pre_translate hook).
      */
-    if (pre_trans ^ (dconf->use_original_uri > 0)) {
+    if (pre_trans ^ dconf->use_original_uri == 1) {
         return DECLINED;
     }