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

(-)modules/proxy/ajp_header.c (-3 / +9 lines)
Lines 341-348 Link Here
341
 *   SetEnv SSL_SESSION_ID CUSTOM_SSL_SESSION_ID
341
 *   SetEnv SSL_SESSION_ID CUSTOM_SSL_SESSION_ID
342
 * </Location>
342
 * </Location>
343
 */
343
 */
344
    /* Also ensure that SC_A_SSL_CERT is only set if not empty */
344
    if ((envvar = ap_proxy_ssl_val(r->pool, r->server, r->connection, r,
345
    if ((envvar = ap_proxy_ssl_val(r->pool, r->server, r->connection, r,
345
                                AJP13_SSL_CLIENT_CERT_INDICATOR))) {
346
                                AJP13_SSL_CLIENT_CERT_INDICATOR))
347
        && (*envvar)) {
346
        if (ajp_msg_append_uint8(msg, SC_A_SSL_CERT) ||
348
        if (ajp_msg_append_uint8(msg, SC_A_SSL_CERT) ||
347
            ajp_msg_append_string(msg, envvar)) {
349
            ajp_msg_append_string(msg, envvar)) {
348
            ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
350
            ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
Lines 352-359 Link Here
352
        }
354
        }
353
    }
355
    }
354
356
357
    /* Also ensure that SC_A_SSL_CIPHER is only set if not empty */
355
    if ((envvar = ap_proxy_ssl_val(r->pool, r->server, r->connection, r,
358
    if ((envvar = ap_proxy_ssl_val(r->pool, r->server, r->connection, r,
356
                                AJP13_SSL_CIPHER_INDICATOR))) {
359
                                AJP13_SSL_CIPHER_INDICATOR))
360
        && (*envvar)) {
357
        if (ajp_msg_append_uint8(msg, SC_A_SSL_CIPHER) ||
361
        if (ajp_msg_append_uint8(msg, SC_A_SSL_CIPHER) ||
358
            ajp_msg_append_string(msg, envvar)) {
362
            ajp_msg_append_string(msg, envvar)) {
359
            ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
363
            ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
Lines 363-370 Link Here
363
        }
367
        }
364
    }
368
    }
365
369
370
    /* Also ensure that SC_A_SSL_SESSION is only set if not empty */
366
    if ((envvar = ap_proxy_ssl_val(r->pool, r->server, r->connection, r,
371
    if ((envvar = ap_proxy_ssl_val(r->pool, r->server, r->connection, r,
367
                                AJP13_SSL_SESSION_INDICATOR))) {
372
                                AJP13_SSL_SESSION_INDICATOR))
373
        && (*envvar)) {
368
        if (ajp_msg_append_uint8(msg, SC_A_SSL_SESSION) ||
374
        if (ajp_msg_append_uint8(msg, SC_A_SSL_SESSION) ||
369
            ajp_msg_append_string(msg, envvar)) {
375
            ajp_msg_append_string(msg, envvar)) {
370
            ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
376
            ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,

Return to bug 36883