View | Details | Raw Unified | Return to bug 57092
Collapse All | Expand All

(-)a/modules/proxy/proxy_util.c (-2 / +4 lines)
Lines 2493-2498 static apr_status_t send_http_connect(proxy_conn_rec *backend, Link Here
2493
    nbytes += apr_snprintf(buffer + nbytes, sizeof(buffer) - nbytes,
2493
    nbytes += apr_snprintf(buffer + nbytes, sizeof(buffer) - nbytes,
2494
                           "Proxy-agent: %s" CRLF CRLF,
2494
                           "Proxy-agent: %s" CRLF CRLF,
2495
                           ap_get_server_banner());
2495
                           ap_get_server_banner());
2496
    ap_xlate_proto_to_ascii(buffer, nbytes);
2496
    apr_socket_send(backend->sock, buffer, &nbytes);
2497
    apr_socket_send(backend->sock, buffer, &nbytes);
2497
2498
2498
    /* Receive the whole CONNECT response */
2499
    /* Receive the whole CONNECT response */
Lines 2504-2510 static apr_status_t send_http_connect(proxy_conn_rec *backend, Link Here
2504
        len += nbytes;
2505
        len += nbytes;
2505
        left -= nbytes;
2506
        left -= nbytes;
2506
        buffer[len] = '\0';
2507
        buffer[len] = '\0';
2507
        if (strstr(buffer + len - nbytes, "\r\n\r\n") != NULL) {
2508
        if (strstr(buffer + len - nbytes, CRLF_ASCII CRLF_ASCII) != NULL) {
2509
            ap_xlate_proto_from_ascii(buffer, len);
2508
            complete = 1;
2510
            complete = 1;
2509
            break;
2511
            break;
2510
        }
2512
        }
Lines 2516-2522 static apr_status_t send_http_connect(proxy_conn_rec *backend, Link Here
2516
            status = apr_socket_recv(backend->sock, drain_buffer, &nbytes);
2518
            status = apr_socket_recv(backend->sock, drain_buffer, &nbytes);
2517
            drain_buffer[nbytes] = '\0';
2519
            drain_buffer[nbytes] = '\0';
2518
            nbytes = sizeof(drain_buffer) - 1;
2520
            nbytes = sizeof(drain_buffer) - 1;
2519
            if (strstr(drain_buffer, "\r\n\r\n") != NULL) {
2521
            if (strstr(drain_buffer, CRLF_ASCII CRLF_ASCII) != NULL) {
2520
                break;
2522
                break;
2521
            }
2523
            }
2522
        }
2524
        }

Return to bug 57092