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

(-)httpd-2.2.11/modules/proxy/ajp_header.c (-3 / +7 lines)
Lines 231-237 Link Here
231
        return AJP_EBAD_METHOD;
231
        return AJP_EBAD_METHOD;
232
    }
232
    }
233
233
234
    is_ssl = (apr_byte_t) ap_proxy_conn_is_https(r->connection);
234
    is_ssl = (apr_byte_t) strcmp(ap_http_scheme(r), "https") == 0;
235
235
236
    if (r->headers_in && apr_table_elts(r->headers_in)) {
236
    if (r->headers_in && apr_table_elts(r->headers_in)) {
237
        const apr_array_header_t *t = apr_table_elts(r->headers_in);
237
        const apr_array_header_t *t = apr_table_elts(r->headers_in);
Lines 239-245 Link Here
239
    }
239
    }
240
240
241
    remote_host = (char *)ap_get_remote_host(r->connection, r->per_dir_config, REMOTE_HOST, NULL);
241
    remote_host = (char *)ap_get_remote_host(r->connection, r->per_dir_config, REMOTE_HOST, NULL);
242
242
    
243
    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
244
            "ajp_marshal_into_msgb: Virtual host = %s://%s:%u",
245
            is_ssl ? "https" : "http", ap_get_server_name(r), ap_get_server_port(r));
246
    
243
    ajp_msg_reset(msg);
247
    ajp_msg_reset(msg);
244
248
245
    if (ajp_msg_append_uint8(msg, CMD_AJP13_FORWARD_REQUEST)     ||
249
    if (ajp_msg_append_uint8(msg, CMD_AJP13_FORWARD_REQUEST)     ||
Lines 249-255 Link Here
249
        ajp_msg_append_string(msg, r->connection->remote_ip)     ||
253
        ajp_msg_append_string(msg, r->connection->remote_ip)     ||
250
        ajp_msg_append_string(msg, remote_host)                  ||
254
        ajp_msg_append_string(msg, remote_host)                  ||
251
        ajp_msg_append_string(msg, ap_get_server_name(r))        ||
255
        ajp_msg_append_string(msg, ap_get_server_name(r))        ||
252
        ajp_msg_append_uint16(msg, (apr_uint16_t)r->connection->local_addr->port) ||
256
        ajp_msg_append_uint16(msg, (apr_uint16_t)ap_get_server_port(r)) ||
253
        ajp_msg_append_uint8(msg, is_ssl)                        ||
257
        ajp_msg_append_uint8(msg, is_ssl)                        ||
254
        ajp_msg_append_uint16(msg, (apr_uint16_t) num_headers)) {
258
        ajp_msg_append_uint16(msg, (apr_uint16_t) num_headers)) {
255
259

Return to bug 46534