[Inteproxy-commits] r145 - in trunk: . inteproxy

[scm-commit@wald.intevation.org]

Author: bh
Date: 2008-06-13 12:55:18 +0200 (Fri, 13 Jun 2008)
New Revision: 145

Modified:
   trunk/ChangeLog
   trunk/inteproxy/main.py
Log:
* inteproxy/main.py (run_server): Add command line options
--rewrite-urls to turn on url rewriting


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-06-12 18:36:39 UTC (rev 144)
+++ trunk/ChangeLog	2008-06-13 10:55:18 UTC (rev 145)
@@ -1,3 +1,8 @@
+2008-06-13  Bernhard Herzog  <bh at intevation.de>
+
+	* inteproxy/main.py (run_server): Add command line options
+	--rewrite-urls to turn on url rewriting
+
 2008-06-12  Bernhard Herzog  <bh at intevation.de>
 
 	* inteproxy/proxycore.py (InteProxyHTTPRequestHandler.rewrite_urls):

Modified: trunk/inteproxy/main.py
===================================================================
--- trunk/inteproxy/main.py	2008-06-12 18:36:39 UTC (rev 144)
+++ trunk/inteproxy/main.py	2008-06-13 10:55:18 UTC (rev 145)
@@ -99,6 +99,7 @@
     parser.add_option("--port", type="int")
     parser.add_option("--workers", type="int")
     parser.add_option("--debug-level", type="int")
+    parser.add_option("--rewrite-urls", action="store_true")
     parser.add_option("--config-file")
     opts, rest = parser.parse_args()
 
@@ -120,7 +121,8 @@
     http_proxy = os.environ.get("http_proxy")
     https_proxy = os.environ.get("https_proxy")
     httpd = ServerClass(server_address, HandlerClass, opts.workers,
-                        http_proxy, https_proxy, transcoder_map=transcoder_map)
+                        http_proxy, https_proxy, transcoder_map=transcoder_map,
+                        rewrite_urls=opts.rewrite_urls)
 
     # import the gtkapp here instead of at top-level to avoid loading
     # the gtk module.  The gtk module requires an Xserver connection