You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by fi...@locus.apache.org on 2000/06/20 06:22:40 UTC
cvs commit: apache-2.0/src/main http_connection.c http_protocol.c
fielding 00/06/19 21:22:39
Modified: src CHANGES
src/include httpd.h
src/main http_connection.c http_protocol.c
Log:
Removed the pointless ap_is_aborted macro.
Revision Changes Path
1.160 +3 -0 apache-2.0/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-2.0/src/CHANGES,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- CHANGES 2000/06/19 19:38:29 1.159
+++ CHANGES 2000/06/20 04:22:38 1.160
@@ -1,4 +1,7 @@
Changes with Apache 2.0a5
+
+ *) Removed pointless ap_is_aborted macro function. [Roy Fielding]
+
*) Add ap_sendfile implementation for AIX
[Victor J. Orlikowski]
1.60 +0 -2 apache-2.0/src/include/httpd.h
Index: httpd.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/include/httpd.h,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- httpd.h 2000/06/19 17:37:52 1.59
+++ httpd.h 2000/06/20 04:22:38 1.60
@@ -1044,8 +1044,6 @@
#endif
#define strtoul strtoul_is_not_a_portable_function_use_strtol_instead
-#define ap_is_aborted(abort) (abort->aborted == 1)
-
/* The C library has functions that allow const to be silently dropped ...
these macros detect the drop in maintainer mode, but use the native
methods far narmal builds
1.40 +1 -2 apache-2.0/src/main/http_connection.c
Index: http_connection.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/http_connection.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- http_connection.c 2000/06/19 17:38:06 1.39
+++ http_connection.c 2000/06/20 04:22:39 1.40
@@ -174,8 +174,7 @@
* to the peer.
*/
- if (ap_bshutdown(c->client, 1) != APR_SUCCESS
- || ap_is_aborted(c)) {
+ if (ap_bshutdown(c->client, 1) != APR_SUCCESS || c->aborted) {
ap_bclose(c->client);
return;
}
1.83 +6 -6 apache-2.0/src/main/http_protocol.c
Index: http_protocol.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/http_protocol.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- http_protocol.c 2000/06/17 16:29:48 1.82
+++ http_protocol.c 2000/06/20 04:22:39 1.83
@@ -2154,7 +2154,7 @@
static void check_first_conn_error(const request_rec *r, const char *operation,
ap_status_t status)
{
- if (!ap_is_aborted(r->connection)) {
+ if (!r->connection->aborted) {
if (status == 0)
status = ap_berror(r->connection->client);
ap_log_rerror(APLOG_MARK, APLOG_INFO, status, r,
@@ -2215,7 +2215,7 @@
if (length == 0)
return 0;
- while (!ap_is_aborted(r->connection)) {
+ while (!r->connection->aborted) {
if ((length > 0) && (total_bytes_sent + IOBUFSIZE) > length)
o = length - total_bytes_sent;
else
@@ -2224,7 +2224,7 @@
n = o;
do {
rv = ap_read(fd, buf, &n);
- } while (rv == APR_EINTR && !ap_is_aborted(r->connection));
+ } while (rv == APR_EINTR && !r->connection->aborted);
if (n < 1) {
break;
@@ -2232,7 +2232,7 @@
o = 0;
- while (n && !ap_is_aborted(r->connection)) {
+ while (n && !r->connection->aborted) {
rv = ap_bwrite(r->connection->client, &buf[o], n, &w);
if (w > 0) {
total_bytes_sent += w;
@@ -2280,13 +2280,13 @@
* as soon as possible */
ap_bsetopt(fb, BO_TIMEOUT, &zero_timeout);
- while (!ap_is_aborted(r->connection)) {
+ while (!r->connection->aborted) {
read_rv = ap_bread(fb, buf, sizeof(buf), &n);
got_read:
bytes_read = n;
/* Regardless of read errors, EOF, etc, bytes may have been read */
o = 0;
- while (n && !ap_is_aborted(r->connection)) {
+ while (n && !r->connection->aborted) {
rv = ap_bwrite(r->connection->client, &buf[o], n, &w);
if (w > 0) {
total_bytes_sent += w;