You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ja...@apache.org on 2016/06/05 09:17:33 UTC
svn commit: r1746884 - /httpd/httpd/trunk/server/protocol.c
Author: jailletc36
Date: Sun Jun 5 09:17:33 2016
New Revision: 1746884
URL: http://svn.apache.org/viewvc?rev=1746884&view=rev
Log:
Delay a table lookup until we know that we can handle the request.
Concat a string at compile time, rather than run time.
Some various style fixes.
Modified:
httpd/httpd/trunk/server/protocol.c
Modified: httpd/httpd/trunk/server/protocol.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/protocol.c?rev=1746884&r1=1746883&r2=1746884&view=diff
==============================================================================
--- httpd/httpd/trunk/server/protocol.c (original)
+++ httpd/httpd/trunk/server/protocol.c Sun Jun 5 09:17:33 2016
@@ -400,7 +400,8 @@ AP_DECLARE(apr_status_t) ap_rgetline_cor
*/
if (do_alloc) {
tmp = NULL;
- } else {
+ }
+ else {
/* We're null terminated. */
tmp = last_char;
}
@@ -605,7 +606,7 @@ static int read_request_line(request_rec
* happen if it exceeds the configured limit for a request-line.
*/
if (APR_STATUS_IS_ENOSPC(rv)) {
- r->status = HTTP_REQUEST_URI_TOO_LARGE;
+ r->status = HTTP_REQUEST_URI_TOO_LARGE;
}
else if (APR_STATUS_IS_TIMEUP(rv)) {
r->status = HTTP_REQUEST_TIME_OUT;
@@ -656,7 +657,8 @@ static int read_request_line(request_rec
r->assbackwards = 0;
pro = ll;
len = strlen(ll);
- } else {
+ }
+ else {
r->assbackwards = 1;
pro = "HTTP/0.9";
len = 8;
@@ -1423,11 +1425,7 @@ AP_DECLARE(void) ap_note_digest_auth_fai
AP_DECLARE(int) ap_get_basic_auth_pw(request_rec *r, const char **pw)
{
- const char *auth_line = apr_table_get(r->headers_in,
- (PROXYREQ_PROXY == r->proxyreq)
- ? "Proxy-Authorization"
- : "Authorization");
- const char *t;
+ const char *t, *auth_line;
if (!(t = ap_auth_type(r)) || ap_casecmpstr(t, "Basic"))
return DECLINED;
@@ -1438,6 +1436,10 @@ AP_DECLARE(int) ap_get_basic_auth_pw(req
return HTTP_INTERNAL_SERVER_ERROR;
}
+ auth_line = apr_table_get(r->headers_in,
+ (PROXYREQ_PROXY == r->proxyreq)
+ ? "Proxy-Authorization" : "Authorization");
+
if (!auth_line) {
ap_note_auth_failure(r);
return HTTP_UNAUTHORIZED;
@@ -1909,12 +1911,14 @@ typedef struct hdr_ptr {
ap_filter_t *f;
apr_bucket_brigade *bb;
} hdr_ptr;
+
static int send_header(void *data, const char *key, const char *val)
{
ap_fputstrs(((hdr_ptr*)data)->f, ((hdr_ptr*)data)->bb,
key, ": ", val, CRLF, NULL);
return 1;
}
+
AP_DECLARE(void) ap_send_interim_response(request_rec *r, int send_headers)
{
hdr_ptr x;
@@ -1947,7 +1951,7 @@ AP_DECLARE(void) ap_send_interim_respons
rr->expecting_100 = 0;
}
- status_line = apr_pstrcat(r->pool, AP_SERVER_PROTOCOL, " ", r->status_line, CRLF, NULL);
+ status_line = apr_pstrcat(r->pool, AP_SERVER_PROTOCOL " ", r->status_line, CRLF, NULL);
ap_xlate_proto_to_ascii(status_line, strlen(status_line));
x.f = r->connection->output_filters;