Commit bfe8f50c authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

Merge branch 'maint-0.3.3' into maint-0.3.4

parents f288f247 6bd06963

changes/bug26470

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (HTTP tunnel):

    - Fix a bug warning when closing an HTTP tunnel connection due to

      an HTTP request we couldn't handle. Fixes bug 26470; bugfix on

      0.3.2.1-alpha.

src/or/connection_edge.c

+4 −1
Original line number Diff line number Diff line
@@ -2556,8 +2556,11 @@ connection_ap_process_http_connect(entry_connection_t *conn) 
 err:

  if (BUG(errmsg == NULL))

    errmsg = "HTTP/1.0 400 Bad Request\r\n\r\n";

  log_warn(LD_EDGE, "Saying %s", escaped(errmsg));

  log_info(LD_EDGE, "HTTP tunnel error: saying %s", escaped(errmsg));

  connection_buf_add(errmsg, strlen(errmsg), ENTRY_TO_CONN(conn));

  /* Mark it as "has_finished" so that we don't try to send an extra socks

   * reply. */

  conn->socks_request->has_finished = 1;

  connection_mark_unattached_ap(conn,

                                END_STREAM_REASON_HTTPPROTOCOL|

                                END_STREAM_REASON_FLAG_ALREADY_SOCKS_REPLIED);