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 ea000fdddcf84925d15225148b576151a6f937fe..e7a6f356715c83dd171937112ed808515fee8f41 100644 (file)
--- 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 13e0f78e6206128b18efde3d73674157eed22328..dec88138b669f4f9811ed1971836942718a516b8 100644 (file)
--- 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 30461f38792f4ad8768aacab6c7edc6f1ceec63a..0b3ad660f90a0d39ecabda0f056fe9a8a877f8ce 100644 (file)
--- 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);