cleanups on r17500

svn:r17501

diff --git a/ChangeLog b/ChangeLog
index 5d37ced6a4435c0f4d2133f52525e3a31680a1d8..7b19b3df1e687479b44be0804690d0a2842ad39e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,9 @@
 Changes in version 0.2.1.8-alpha - 2008-12-06
-  o Major feature:
-    - New DirPortFrontPage option that takes an html file and publishes it as
-      "/" on the DirPort. Now relay operators can provide a disclaimer without
-      needing to set up a separate webserver. There's a sample disclaimer 
-      in contrib/tor-exit-notice.html.
+  o Major features:
+    - New DirPortFrontPage option that takes an html file and publishes
+      it as "/" on the DirPort. Now relay operators can provide a
+      disclaimer without needing to set up a separate webserver. There's
+      a sample disclaimer in contrib/tor-exit-notice.html.
 
   o Major bugfixes:
     - Fix a DOS opportunity during the voting signature collection process

diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in
index 20322caec9743abeef4a16b592b7cdbeb59731a2..69012dd940d89bcf3f4c4bcb489317db805ff8ef 100644 (file)
--- a/src/config/torrc.sample.in
+++ b/src/config/torrc.sample.in
@@ -108,9 +108,9 @@ SocksListenAddress 127.0.0.1 # accept connections only from localhost
 ## below too. You'll need to do ipchains or other port forwarding yourself
 ## to make this work.
 #DirListenAddress 0.0.0.0:9091
-
-## Uncomment this to return an arbitrary blob of html on your DirPort. You may
-## wish to use this blob of html to inform clients about your Tor server.
+## Uncomment to return an arbitrary blob of html on your DirPort. Now you
+## can explain what Tor is if anybody wonders why your IP address is
+## contacting them.
 #DirPortFrontPage /etc/tor/exit-notice.html
 
 ## Uncomment this if you run more than one Tor server, and add the

diff --git a/src/or/config.c b/src/or/config.c
index f08a55dd46049a7f297c21cce2016df529474c0f..3deebf89bb3ad0391acc32c357b85e356b0058c6 100644 (file)
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -756,7 +756,7 @@ static char *torrc_fname = NULL;
 static or_state_t *global_state = NULL;
 /** Configuration Options set by command line. */
 static config_line_t *global_cmdline_options = NULL;
-/** Contents of most recently read DirPortFrontPage option file. */
+/** Contents of most recently read DirPortFrontPage file. */
 static char *global_dirfrontpagecontents = NULL;
 
 /** Return the contents of our frontpage string, or NULL if not configured. */

diff --git a/src/or/directory.c b/src/or/directory.c
index 14470060a0c0092e4fb0550051261b325bab10f5..3cf6e366cd4a5cc5810bd229827d1f325b6ddb2b 100644 (file)
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -2479,7 +2479,8 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers,
 
     if (frontpage) {
       dlen = strlen(frontpage);
-      /* Lets return a disclaimer, users shouldn't use V1 anymore */
+      /* Let's return a disclaimer page (users shouldn't use V1 anymore,
+         and caches don't fetch '/', so this is safe). */
       if (global_write_bucket_low(TO_CONN(conn), dlen, 1)) {
         log_info(LD_DIRSERV,
                  "Client asked for DirPortFrontPage content, but we've been "
@@ -2493,6 +2494,7 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers,
       connection_write_to_buf(frontpage, dlen, TO_CONN(conn));
       goto done;
     }
+    /* if no disclaimer file, fall through and continue */
   }
 
   if (!strcmp(url,"/tor/") || !strcmp(url,"/tor/dir")) { /* v1 dir fetch */