Original release 20160328

[fex.git] / bin / fexsrv

diff --git a/bin/fexsrv b/bin/fexsrv
index e89b6f9bd578d62186219d255d076dd2c37ceb9d..8bef7fc65fb91fa7dd7018f7f97a7fec586127f7 100755 (executable)
--- a/bin/fexsrv
+++ b/bin/fexsrv
@@ -254,7 +254,7 @@ REQUEST: while (*STDIN) {
     # reverse-proxy?
     # (only IPv4 support!)
     if ($reverse_proxy_ip and $reverse_proxy_ip eq $ra and
     # reverse-proxy?
     # (only IPv4 support!)
     if ($reverse_proxy_ip and $reverse_proxy_ip eq $ra and

-       /^\S*(Forwarded|Client-IP|Coming-From)\S*: ([\d.]+)/i
+       /^\S*(Forwarded|Client-IP|Coming-From)\S*: ([\da-f:.]+)/i

     ) {
       $ENV{REMOTE_ADDR} = $ra = $2;
       $ENV{REMOTE_HOST} = $rh = gethostbyaddr(inet_aton($ra),AF_INET) || '';
     ) {
       $ENV{REMOTE_ADDR} = $ra = $2;
       $ENV{REMOTE_HOST} = $rh = gethostbyaddr(inet_aton($ra),AF_INET) || '';


@@ -881,6 +881,7 @@ sub redirect {
       '</body></html>'
     ));
   }
       '</body></html>'
     ));
   }

+  fexlog($connect,@log,"REDIRECT $newurl");

   if ($rr =~ /^http/) {
     exit;
   } else {
   if ($rr =~ /^http/) {
     exit;
   } else {