[tor-commits] [bridgedb/master] Move the addition of options.html leaf before bridges.html.

[isis at torproject.org]

commit 01b2d27eb0a664c8032ff8a40a1b9b628fce2c4c
Author: Isis Lovecruft <isis at torproject.org>
Date:   Tue Mar 4 08:36:19 2014 +0000

    Move the addition of options.html leaf before bridges.html.
---
 lib/bridgedb/HTTPServer.py |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py
index 1e4bfac..8b65fa6 100644
--- a/lib/bridgedb/HTTPServer.py
+++ b/lib/bridgedb/HTTPServer.py
@@ -691,14 +691,12 @@ def addWebServer(cfg, dist, sched):
                       static.File(os.path.join(template_root, 'robots.txt')))
     httpdist.putChild('assets',
                       static.File(os.path.join(template_root, 'assets/')))
+    httpdist.putChild('options', WebResourceOptions())
 
     resource = WebResourceBridges(dist, sched, cfg.HTTPS_N_BRIDGES_PER_ANSWER,
                    cfg.HTTP_USE_IP_FROM_FORWARDED_HEADER,
                    includeFingerprints=cfg.HTTPS_INCLUDE_FINGERPRINTS)
 
-    resource_options = WebResourceOptions()
-
-    httpdist.putChild('options', resource_options)
     if cfg.RECAPTCHA_ENABLED:
         protected = CaptchaProtectedResource(
                 recaptchaPrivKey=cfg.RECAPTCHA_PRIV_KEY,