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

(-)file_not_specified_in_diff (-18 / +29 lines)
Line  Link Here
0
-- mod_proxy_fcgi.c
0
++ mod_proxy_fcgi.c
Line 384 Link Here
384
    apr_bucket_brigade *ib, *ob;
384
    apr_bucket_brigade *ib, *ob, *cib;
385
--
Line 392 Link Here
392
    apr_pollfd_t pfd;
392
    apr_pollfd_t pfd[2];
393
--
Lines 395-398 Link Here
395
    pfd.desc_type = APR_POLL_SOCKET;
395
    pfd[0].desc_type = APR_POLL_SOCKET;
396
    pfd.desc.s = conn->sock;
396
    pfd[0].desc.s = conn->sock;
397
    pfd.p = r->pool;
397
    pfd[0].p = r->pool;
398
    pfd.reqevents = APR_POLLIN | APR_POLLOUT;
398
	pfd[0].reqevents = APR_POLLIN | APR_POLLOUT;
399
--
Line 400 Link Here
400
	pfd[1].desc_type = APR_POLL_SOCKET;
401
	pfd[1].desc.s = (apr_socket_t*)ap_get_module_config(r->connection->conn_config, &core_module);
402
	pfd[1].p = r->connection->pool;
403
	pfd[1].reqevents = APR_POLLIN;
Line 403 Link Here
408
	cib = apr_brigade_create(r->connection->pool, c->bucket_alloc);
Line 412 Link Here
412
        rv = apr_poll(&pfd, 1, &n, timeout);
419
		rv = apr_poll(pfd, 2, &n, timeout);
413
--
Line 420 Link Here
420
        if (pfd.rtnevents & APR_POLLOUT) {
427
        if (pfd[0].rtnevents & APR_POLLOUT) {
421
--
Line 466 Link Here
466
                pfd.reqevents = APR_POLLIN; /* Done with input data */
473
                pfd[0].reqevents = APR_POLLIN; /* Done with input data */
467
--
Line 481 Link Here
481
        if (pfd.rtnevents & APR_POLLIN) {
489
		if( pfd[1].rtnevents & APR_POLLIN ) {
482
--
490
			rv = ap_get_brigade(r->connection->input_filters, cib, AP_MODE_SPECULATIVE, APR_NONBLOCK_READ, 256);
491
			if( rv != APR_SUCCESS && rv != APR_EAGAIN ) {
492
                ap_fcgi_fill_in_header(&header, AP_FCGI_ABORT_REQUEST, request_id,
493
                                        0, 0);
494
                ap_fcgi_header_to_array(&header, farray);
Line 482 Link Here
496
                vec[0].iov_base = (void *)farray;
497
                vec[0].iov_len = sizeof(farray);
Line 482 Link Here
499
                rv = send_data(conn, vec, 1, &len, 1);
500
				break;
501
			}
502
		}
Line 482 Link Here
504
        if (pfd[0].rtnevents & APR_POLLIN) {
Line 681 Link Here
704
                apr_brigade_destroy(cib);

Return to bug 56188