From 52cd23ff837b9512a4dd3c9e43c11ca197142844 Mon Sep 17 00:00:00 2001
From: Eric Anderson <eric@pixelwareinc.com>
Date: Mon, 20 Jan 2014 14:36:01 -0500
Subject: [PATCH] Proxy off to PHP better.

The preserve_host option on rack-rewrite seems a bit off. I would assume it
would mean it keeps the hostname requested. But instead it replaces it with
the internal hostname (the host we proxy to). There is a ticket related to
this (https://github.com/jaswope/rack-reverse-proxy/issues/11).

In addition, even if it pulled from the right host it also doesn't include
the port. There is also already a ticket for this
(https://github.com/jaswope/rack-reverse-proxy/pull/17).

To resolve this I simply avoiding using the preserve host option. This allows
the original host to pass on through to PHP (it doesn't seem to need to be
explicitly set, PHP already know it).

Both of these option (wrong host and missing port) cause some PHP scripts,
like Wordpress, who are trying to redirect to a canonical URL to get caught
in an infinate loop.

I am also now stripping out the index.php from the PATH_INFO before proxying
off. The PHP webserver has it's own built-in method of looking for the
index.php. So we add it for detecting the PHP handler should be called but
then remove it to let PHP do things it's own way. This helps for script like
Wordpress that try to direct to a canoncial URL. It prevent it from bouncing
between index.php and the root directory. It may be slightly incorrect for
cases where the user explicitly chose to pull up the index.php script. But
in the real world I don't know where that would cause a problem and making
this change solves a real world problem for Wordpress.

Finally, I am passing on the HTTP_X_FORWARDED_FOR header. Although not
standardized it is fairly widely and provide a way for the script to determine
the IP address of the real browser since REMOTE_ADDR will be set to the
proxy server.
---
 lib/rack/legacy/php.rb | 8 +++++++-
 rack-legacy.gemspec    | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/rack/legacy/php.rb b/lib/rack/legacy/php.rb
index d1fc2ff..87460ee 100644
--- a/lib/rack/legacy/php.rb
+++ b/lib/rack/legacy/php.rb
@@ -22,7 +22,10 @@ class Rack::Legacy::Php
   # 
   def initialize app, public_dir=Dir.getwd, php_exe='php', port=8180, quiet=false
     @app = app; @public_dir = public_dir
-    @proxy = Rack::ReverseProxy.new {reverse_proxy /^.*$/, "http://localhost:#{port}"}
+    @proxy = Rack::ReverseProxy.new do
+      reverse_proxy_options preserve_host: false
+      reverse_proxy /^.*$/, "http://localhost:#{port}"
+    end
     @php = ChildProcess.build php_exe,
       '-S', "localhost:#{port}", '-t', public_dir
     @php.io.inherit! unless quiet
@@ -35,6 +38,9 @@ def initialize app, public_dir=Dir.getwd, php_exe='php', port=8180, quiet=false
   def call env
     if valid? env['PATH_INFO']
       @php.start unless @php.alive?
+      ip = Rack::Request.new(env).ip
+      env['HTTP_X_FORWARDED_FOR'] = ip if ip
+      env['PATH_INFO'].gsub! /\/index.php$/, '/'
       @proxy.call env
     else
       @app.call env
diff --git a/rack-legacy.gemspec b/rack-legacy.gemspec
index 59aaedd..7c61c84 100644
--- a/rack-legacy.gemspec
+++ b/rack-legacy.gemspec
@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'rack-legacy'
-  s.version = '0.9.0'
+  s.version = '0.9.1'
   s.homepage = 'https://github.com/eric1234/rack-legacy'
   s.author = 'Eric Anderson'
   s.email = 'eric@pixelwareinc.com'