From 570a2b8bb47a600a987ec2f474a30a028f5e7dd1 Mon Sep 17 00:00:00 2001 From: Manoj Kasichainula Date: Sun, 31 Oct 1999 09:13:22 +0000 Subject: [PATCH] Finish removing references to errno from buff, by introducing ap_berror() to return the status from calls that don't return an ap_status_t. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84077 13f79535-47bb-0310-9956-ffa450edef68 --- modules/http/http_protocol.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c index fd09d20936..d9f68cb72e 100644 --- a/modules/http/http_protocol.c +++ b/modules/http/http_protocol.c @@ -2212,7 +2212,8 @@ API_EXPORT(int) ap_rputc(int c, request_rec *r) if (ap_bputc(c, r->connection->client) < 0) { if (!r->connection->aborted) { - ap_log_rerror(APLOG_MARK, APLOG_INFO, errno, r, + ap_log_rerror(APLOG_MARK, APLOG_INFO, + ap_berror(r->connection->client), r, "client stopped connection before rputc completed"); ap_bsetflag(r->connection->client, B_EOUT, 1); r->connection->aborted = 1; @@ -2233,7 +2234,8 @@ API_EXPORT(int) ap_rputs(const char *str, request_rec *r) rcode = ap_bputs(str, r->connection->client); if (rcode < 0) { if (!r->connection->aborted) { - ap_log_rerror(APLOG_MARK, APLOG_INFO, errno, r, + ap_log_rerror(APLOG_MARK, APLOG_INFO, + ap_berror(r->connection->client), r, "client stopped connection before rputs completed"); ap_bsetflag(r->connection->client, B_EOUT, 1); r->connection->aborted = 1; @@ -2277,7 +2279,8 @@ API_EXPORT(int) ap_vrprintf(request_rec *r, const char *fmt, va_list ap) if (n < 0) { if (!r->connection->aborted) { - ap_log_rerror(APLOG_MARK, APLOG_INFO, errno, r, + ap_log_rerror(APLOG_MARK, APLOG_INFO, + ap_berror(r->connection->client), r, "client stopped connection before vrprintf completed"); ap_bsetflag(r->connection->client, B_EOUT, 1); r->connection->aborted = 1; @@ -2302,7 +2305,8 @@ API_EXPORT(int) ap_rprintf(request_rec *r, const char *fmt,...) if (n < 0) { if (!r->connection->aborted) { - ap_log_rerror(APLOG_MARK, APLOG_INFO, errno, r, + ap_log_rerror(APLOG_MARK, APLOG_INFO, + ap_berror(r->connection->client), r, "client stopped connection before rprintf completed"); ap_bsetflag(r->connection->client, B_EOUT, 1); r->connection->aborted = 1; @@ -2360,7 +2364,6 @@ API_EXPORT(int) ap_rflush(request_rec *r) ap_bsetflag(r->connection->client, B_EOUT, 1); r->connection->aborted = 1; } - errno = rv; return EOF; } return 0; -- 2.40.0