From f018f2d714b2ab0fd0232f4003a89500e1a4096e Mon Sep 17 00:00:00 2001 From: "William A. Rowe Jr" Date: Thu, 22 Dec 2016 18:48:47 +0000 Subject: [PATCH] Backports: r1102124 (in part, protocol.c only) Submitted by: sf Use APR_STATUS_IS_... in some more cases. While this is not strictly necessary everywhere, it makes it much easier to find the problematic cases. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775697 13f79535-47bb-0310-9956-ffa450edef68 --- server/protocol.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/protocol.c b/server/protocol.c index f20f315269f..b96d9c760f4 100644 --- a/server/protocol.c +++ b/server/protocol.c @@ -608,13 +608,13 @@ static int read_request_line(request_rec *r, apr_bucket_brigade *bb) * buffer before finding the end-of-line. This is only going to * happen if it exceeds the configured limit for a request-line. */ - if (rv == APR_ENOSPC) { + if (APR_STATUS_IS_ENOSPC(rv)) { r->status = HTTP_REQUEST_URI_TOO_LARGE; } else if (APR_STATUS_IS_TIMEUP(rv)) { r->status = HTTP_REQUEST_TIME_OUT; } - else if (rv == APR_EINVAL) { + else if (APR_STATUS_IS_EINVAL(rv)) { r->status = HTTP_BAD_REQUEST; } r->proto_num = HTTP_VERSION(1,0); -- 2.47.2