From: André Malo <nd@apache.org>
Date: Wed, 28 Jan 2004 19:47:29 +0000 (+0000)
Subject: make remote port available to mod_rewrite
X-Git-Tag: 2.0.49~188
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf6ef8309e3b843e87646f915e2dfb49cd12e690;p=thirdparty%2Fapache%2Fhttpd.git

make remote port available to mod_rewrite

PR: 25772
Reviewed by: Jeff Trawick, Brad Nicholes


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

diff --git a/CHANGES b/CHANGES
index ea000fdddcf..e7a6f356715 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.49
 
+  *) Make REMOTE_PORT variable available in mod_rewrite.
+     PR 25772.  [André Malo]
+
   *) Fix a long delay with CGI requests and keepalive connections on
      AIX.  [Jeff Trawick]
 
diff --git a/STATUS b/STATUS
index 13e0f78e620..dec88138b66 100644
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/01/28 19:20:28 $]
+Last modified at [$Date: 2004/01/28 19:47:28 $]
 
 Release:
 
@@ -318,11 +318,6 @@ PATCHES TO BACKPORT FROM 2.1
         modules/experimental/cache_cache.c r1.5
       +1: jwoolley, bnicholes, rederpj
 
-    * Make REMOTE_PORT available to mod_rewrite (2.0 + 1.3)
-      PR 25772.
-        modules/mappers/mod_rewrite.c: r1.239
-      +1: nd, trawick, bnicholes
-
     * Don't let mod_usertrack overwrite other cookies. (2.0 + 1.3)
       PR 26002.
         modules/metadata/mod_usertrack.c: r1.44
diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index 30461f38792..0b3ad660f90 100644
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -3796,6 +3796,9 @@ static char *lookup_variable(request_rec *r, char *var)
     else if (strcasecmp(var, "REMOTE_ADDR") == 0) {
         result = r->connection->remote_ip;
     }
+    else if (strcasecmp(var, "REMOTE_PORT") == 0) {
+        return apr_itoa(r->pool, r->connection->remote_addr->port);
+    }
     else if (strcasecmp(var, "REMOTE_HOST") == 0) {
         result = (char *)ap_get_remote_host(r->connection,
                                             r->per_dir_config, REMOTE_NAME, NULL);