Commit 4a9384cc authored by Graham Leggett's avatar Graham Leggett
Browse files

Various cleanups and comments 

PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88766 13f79535-47bb-0310-9956-ffa450edef68
parent 4df4e170

modules/proxy/proxy_connect.c

+27 −7
Original line number Diff line number Diff line
@@ -111,7 +111,9 @@ int ap_proxy_connect_handler(request_rec *r, char *url, 
    char buffer[HUGE_STRING_LEN];

    int nbytes, i, err;



#if 0

    apr_socket_t *client_sock = NULL;

#endif

    apr_pollfd_t *pollfd;

    apr_int32_t pollcnt;

    apr_int16_t pollevent;
@@ -250,6 +252,15 @@ int ap_proxy_connect_handler(request_rec *r, char *url, 
     * Step Three: Send the Request

     *

     * Send the HTTP/1.1 CONNECT request to the remote server

     */



    /* XXXX FIXME: we are acting as a tunnel - the output filter stack should ideally

     * be completely empty, because when we are done here we are done completely.

     * Is there such a thing as a NULL filter?

     */

/*    r->output_filters = NULL;

 *    r->connection->output_filters = NULL;

 *   ap_add_output_filter("NULL", NULL, r, r->connection);

 */



    /* If we are connecting through a remote proxy, we need to pass
@@ -258,23 +269,28 @@ int ap_proxy_connect_handler(request_rec *r, char *url, 
    if (proxyport) {

	/* FIXME: Error checking ignored.

	 */

        ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, NULL,

        ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,

		     "proxy: CONNECT: sending the CONNECT request to the remote proxy");

        nbytes = apr_snprintf(buffer, sizeof(buffer),

			      "CONNECT %s HTTP/1.1" CRLF, r->uri);

			      "CONNECT %s HTTP/1.0" CRLF, r->uri);

        apr_send(sock, buffer, &nbytes);

        nbytes = apr_snprintf(buffer, sizeof(buffer),

			      "Proxy-agent: %s" CRLF CRLF, ap_get_server_version());

        apr_send(sock, buffer, &nbytes);

    }

    else {

        ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, NULL,

        ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,

		     "proxy: CONNECT: Returning 200 OK Status");

        ap_rvputs(r, "HTTP/1.1 200 Connection established" CRLF, NULL);

        ap_rvputs(r, "Proxy-agent: ", ap_get_server_version(), CRLF CRLF, NULL);

        ap_rflush(r);

        nbytes = apr_snprintf(buffer, sizeof(buffer),

			      "HTTP/1.0 200 Connection Established" CRLF);

        apr_send(sock, buffer, &nbytes);

        nbytes = apr_snprintf(buffer, sizeof(buffer),

			      "Proxy-agent: %s" CRLF CRLF, ap_get_server_version());

        apr_send(sock, buffer, &nbytes);

    }



    ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,

		 "proxy: CONNECT: setting up poll()");



    /*

     * Step Four: Handle Data Transfer
@@ -282,6 +298,8 @@ int ap_proxy_connect_handler(request_rec *r, char *url, 
     * Handle two way transfer of data over the socket (this is a tunnel).

     */



/*    r->sent_bodyct = 1;*/



    if(apr_poll_setup(&pollfd, 2, r->pool) != APR_SUCCESS)

    {

	apr_socket_close(sock);
@@ -345,7 +363,7 @@ int ap_proxy_connect_handler(request_rec *r, char *url, 
                    break;

            }



            apr_poll_revents_get(&pollevent, client_sock, pollfd);

            apr_poll_revents_get(&pollevent, sock, pollfd);

            if (pollevent & APR_POLLIN) {

                ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, NULL,

                             "proxy: CONNECT: client was set");
@@ -370,6 +388,8 @@ int ap_proxy_connect_handler(request_rec *r, char *url, 
            break;

    }



    ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,

		 "proxy: CONNECT: finished with poll() - cleaning up");



    /*

     * Step Five: Clean Up