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

(-)file_not_specified_in_diff (-1 / +11 lines)
Line  Link Here
0
-- httpd-2.4.2/modules/proxy/mod_proxy_balancer.c
0
++ httpd-2.4.2/modules/proxy/mod_proxy_balancer.c
Lines 825-830 Link Here
825
                proxy_worker_shared *shm;
825
                proxy_worker_shared *shm;
826
826
827
                worker = *workers;
827
                worker = *workers;
828
829
                /* Ckeck if we grabbed already */
830
                if (storage->dptr(balancer->wslot, worker->s->index, (void *)&shm) == APR_SUCCESS) {
831
                    if (shm == worker->s) {
832
                        /* worker->s pointed to some shm before */
833
                        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(05561) "won't grab worker-SHM %lu with index %d twice", (unsigned long int)(worker->s), worker->s->index);
834
                        continue;
835
                    }
836
                }
837
828
                if ((rv = storage->grab(balancer->wslot, &index)) != APR_SUCCESS) {
838
                if ((rv = storage->grab(balancer->wslot, &index)) != APR_SUCCESS) {
829
                    ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s, APLOGNO(01186) "worker slotmem_grab failed");
839
                    ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s, APLOGNO(01186) "worker slotmem_grab failed");
830
                    return !OK;
840
                    return !OK;

Return to bug 52402