set Content-Type on the directory and hidserv descriptor

svn:r1731

diff --git a/src/or/directory.c b/src/or/directory.c
index 7c3e68a679be8fc713723861373a82be975d14b1..1c8fa059a0a2435dc1e9c07224102a5cb78dfc5e 100644 (file)
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -354,7 +354,7 @@ static int directory_handle_command_get(connection_t *conn,
     }
 
     log_fn(LOG_DEBUG,"Dumping directory to client.");
-    snprintf(tmp, sizeof(tmp), "HTTP/1.0 200 OK\r\nContent-Length: %d\r\n\r\n",
+    snprintf(tmp, sizeof(tmp), "HTTP/1.0 200 OK\r\nContent-Length: %d\r\nContent-Type: text/plain\r\n\r\n",
              (int)dlen);
     connection_write_to_buf(tmp, strlen(tmp), conn);
     connection_write_to_buf(cp, strlen(cp), conn);
@@ -368,7 +368,7 @@ static int directory_handle_command_get(connection_t *conn,
 
     switch(rend_cache_lookup_desc(url+strlen(rend_fetch_url), &descp, &desc_len)) {
       case 1: /* valid */
-        snprintf(tmp, sizeof(tmp), "HTTP/1.0 200 OK\r\nContent-Length: %d\r\n\r\n",
+        snprintf(tmp, sizeof(tmp), "HTTP/1.0 200 OK\r\nContent-Length: %d\r\nContent-Type: application/octet-stream\r\n\r\n",
                  desc_len); /* can't include descp here, because it's got nuls */
         connection_write_to_buf(tmp, strlen(tmp), conn);
         connection_write_to_buf(descp, desc_len, conn);

diff --git a/src/or/rendmid.c b/src/or/rendmid.c
index b40e81b48b0cebf95356c202a5528a97ad007b92..10eeab4dffd63985fa5eb6fcfddf52c97ab764b9 100644 (file)
--- a/src/or/rendmid.c
+++ b/src/or/rendmid.c
@@ -173,7 +173,7 @@ rend_mid_introduce(circuit_t *circ, const char *request, int request_len)
   return -1;
 }
 
-/* Process an ESTABLISH_RENDEZVOUS cell by settingthe circuit's purpose and
+/* Process an ESTABLISH_RENDEZVOUS cell by setting the circuit's purpose and
  * rendezvous cookie.
  */
 int