Attachment #22224 for bug #45355

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




    }

    if (windowsize != 0) {
        rv = apr_socket_opt_set(c->aprsock, APR_SO_SNDBUF,
                                windowsize);
        if (rv != APR_SUCCESS && rv != APR_ENOTIMPL) {
            apr_err("socket send buffer", rv);
        }
        rv = apr_socket_opt_set(c->aprsock, APR_SO_RCVBUF,
                                windowsize);
        if (rv != APR_SUCCESS && rv != APR_ENOTIMPL) {
            apr_err("socket receive buffer", rv);

                /* The response may not have a Content-Length header */
                if (!cl) {
                    c->keepalive = 1;
                    c->length = 0;
                }
            }
            c->bread += c->cbx - (s + l - c->cbuff) + r - tocopy;
            totalbread += c->bread;

    start = lasttime = apr_time_now();
    stoptime = tlimit ? (start + apr_time_from_sec(tlimit)) : AB_MAX;

#ifdef SIGINT
    /* Output the results if the user terminates the run early. */
    apr_signal(SIGINT, output_results);
#endif

                }
        }
    } while (lasttime < stoptime && done < requests);

    if (heartbeatres)
        fprintf(stderr, "Finished %d requests\n", done);
    else

Return to bug 45355

Lines 1153-1164 Link Here

(-)ab.c.orig (-6 / +6 lines)
1153	}	1153	}
1154		1154
1155	if (windowsize != 0) {	1155	if (windowsize != 0) {
1156	rv = apr_socket_opt_set(c->aprsock, APR_SO_SNDBUF,	1156	rv = apr_socket_opt_set(c->aprsock, APR_SO_SNDBUF,
1157	windowsize);	1157	windowsize);
1158	if (rv != APR_SUCCESS && rv != APR_ENOTIMPL) {	1158	if (rv != APR_SUCCESS && rv != APR_ENOTIMPL) {
1159	apr_err("socket send buffer", rv);	1159	apr_err("socket send buffer", rv);
1160	}	1160	}
1161	rv = apr_socket_opt_set(c->aprsock, APR_SO_RCVBUF,	1161	rv = apr_socket_opt_set(c->aprsock, APR_SO_RCVBUF,
1162	windowsize);	1162	windowsize);
1163	if (rv != APR_SUCCESS && rv != APR_ENOTIMPL) {	1163	if (rv != APR_SUCCESS && rv != APR_ENOTIMPL) {
1164	apr_err("socket receive buffer", rv);	1164	apr_err("socket receive buffer", rv);
Lines 1472-1479 Link Here
1472	/* The response may not have a Content-Length header */	1472	/* The response may not have a Content-Length header */
1473	if (!cl) {	1473	if (!cl) {
1474	c->keepalive = 1;	1474	c->keepalive = 1;
1475	c->length = 0;	1475	c->length = 0;
1476	}	1476	}
1477	}	1477	}
1478	c->bread += c->cbx - (s + l - c->cbuff) + r - tocopy;	1478	c->bread += c->cbx - (s + l - c->cbuff) + r - tocopy;
1479	totalbread += c->bread;	1479	totalbread += c->bread;
Lines 1660-1666 Link Here
1660	start = lasttime = apr_time_now();	1660	start = lasttime = apr_time_now();
1661	stoptime = tlimit ? (start + apr_time_from_sec(tlimit)) : AB_MAX;	1661	stoptime = tlimit ? (start + apr_time_from_sec(tlimit)) : AB_MAX;
1662		1662
1663	#ifdef SIGINT	1663	#ifdef SIGINT
1664	/* Output the results if the user terminates the run early. */	1664	/* Output the results if the user terminates the run early. */
1665	apr_signal(SIGINT, output_results);	1665	apr_signal(SIGINT, output_results);
1666	#endif	1666	#endif
Lines 1777-1783 Link Here
1777	}	1777	}
1778	}	1778	}
1779	} while (lasttime < stoptime && done < requests);	1779	} while (lasttime < stoptime && done < requests);
1780		1780
1781	if (heartbeatres)	1781	if (heartbeatres)
1782	fprintf(stderr, "Finished %d requests\n", done);	1782	fprintf(stderr, "Finished %d requests\n", done);
1783	else	1783	else