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

(-)apache-1.3/mod_jk.c (+10 lines)
Lines 646-651 Link Here
646
    e = (rule_extension_t *)ap_get_module_config(r->request_config, &jk_module);
646
    e = (rule_extension_t *)ap_get_module_config(r->request_config, &jk_module);
647
    if (e) {
647
    if (e) {
648
        s->extension.reply_timeout = e->reply_timeout;
648
        s->extension.reply_timeout = e->reply_timeout;
649
        s->extension.use_server_error_pages = e->use_server_error_pages;
649
        if (e->activation) {
650
        if (e->activation) {
650
            s->extension.activation = ap_palloc(r->pool, e->activation_size * sizeof(int));
651
            s->extension.activation = ap_palloc(r->pool, e->activation_size * sizeof(int));
651
            memcpy(s->extension.activation, e->activation, e->activation_size * sizeof(int));
652
            memcpy(s->extension.activation, e->activation, e->activation_size * sizeof(int));
Lines 2249-2254 Link Here
2249
            jk_close_pool(&private_data.p);
2250
            jk_close_pool(&private_data.p);
2250
            if (rc > 0) {
2251
            if (rc > 0) {
2252
                if (s.extension.use_server_error_pages &&
2253
                    s.http_response_status >= s.extension.use_server_error_pages) {
2254
                    if (JK_IS_DEBUG_LEVEL(conf->log))
2255
                        jk_log(conf->log, JK_LOG_DEBUG, "Forwarding status=%d"
2256
                               " for worker=%s",
2257
                               s.http_response_status, worker_name);
2258
                    JK_TRACE_EXIT(conf->log);
2259
                    return s.http_response_status;
2260
                }
2251
                /* If tomcat returned no body and the status is not OK,
2261
                /* If tomcat returned no body and the status is not OK,
2252
                   let apache handle the error code */
2262
                   let apache handle the error code */
2253
                if (!r->sent_bodyct && r->status >= HTTP_BAD_REQUEST) {
2263
                if (!r->sent_bodyct && r->status >= HTTP_BAD_REQUEST) {

Return to bug 46169