Merge branch 'maint-0.3.1' into release-0.3.1
This commit is contained in:
commit
602f9565a9
|
@ -0,0 +1,3 @@
|
||||||
|
o Minor bugfixes (directory authority, backport from 0.3.2.1-alpha):
|
||||||
|
- Remove the length limit on HTTP status lines that authorities can send
|
||||||
|
in their replies. Fixes bug 23499; bugfix on 0.3.1.6-rc.
|
|
@ -3282,14 +3282,12 @@ static void
|
||||||
write_http_status_line(dir_connection_t *conn, int status,
|
write_http_status_line(dir_connection_t *conn, int status,
|
||||||
const char *reason_phrase)
|
const char *reason_phrase)
|
||||||
{
|
{
|
||||||
char buf[256];
|
char *buf = NULL;
|
||||||
if (tor_snprintf(buf, sizeof(buf), "HTTP/1.0 %d %s\r\n\r\n",
|
tor_asprintf(&buf, "HTTP/1.0 %d %s\r\n\r\n",
|
||||||
status, reason_phrase ? reason_phrase : "OK") < 0) {
|
status, reason_phrase ? reason_phrase : "OK");
|
||||||
log_warn(LD_BUG,"status line too long.");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
log_debug(LD_DIRSERV,"Wrote status 'HTTP/1.0 %d %s'", status, reason_phrase);
|
log_debug(LD_DIRSERV,"Wrote status 'HTTP/1.0 %d %s'", status, reason_phrase);
|
||||||
connection_write_to_buf(buf, strlen(buf), TO_CONN(conn));
|
connection_write_to_buf(buf, strlen(buf), TO_CONN(conn));
|
||||||
|
tor_free(buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Write the header for an HTTP/1.0 response onto <b>conn</b>-\>outbuf,
|
/** Write the header for an HTTP/1.0 response onto <b>conn</b>-\>outbuf,
|
||||||
|
|
Loading…
Reference in New Issue