Actually send the extra_headers content in write_http_response_header_impl. This make X-Descriptor-Now-New get sent. Bugfix on 0.2.0.10-alpha. Spotted by "multiplication".

svn:r18297

2 files changed, 5 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index bd0c4dde62..e14200571e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,8 @@ Changes in version 0.2.1.12-alpha - 2009-02-??
       0.0.9pre6.
     - Remove a bash-ism from configure.in to build properly on non-Linux
       platforms.  Bugfix on 0.2.1.1-alpha.
+    - Fix code so authorities _actually_ send back X-Descriptor-Not-New
+      headers.  Bugfix on 0.2.0.10-alpha.
 
   o Minor features:
     - Support platforms where time_t is 64 bits long. (Congratulations,
diff --git a/src/or/directory.c b/src/or/directory.c
index f72ab41bf6..6fac10dd7d 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -2165,8 +2165,10 @@ write_http_response_header_impl(dir_connection_t *conn, ssize_t length,
     strlcpy(cp, "Pragma: no-cache\r\n", sizeof(tmp)-(cp-tmp));
     cp += strlen(cp);
   }
-  if (extra_headers)
+  if (extra_headers) {
     strlcpy(cp, extra_headers, sizeof(tmp)-(cp-tmp));
+    cp += strlen(cp);
+  }
   if (sizeof(tmp)-(cp-tmp) > 3)
     memcpy(cp, "\r\n", 3);
   else