summaryrefslogtreecommitdiff
path: root/usr.sbin/httpd
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2014-09-29 19:30:48 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2014-09-29 19:30:48 +0000
commitd85610dc0af6079fdc2c1e29049368881c3acb06 (patch)
treed79dcb6faada6a5d4b6745b375a3221df08a5fce /usr.sbin/httpd
parent07dc3e8c51aefb18a115b3fbd878da9a9d4e68d1 (diff)
whitespace spotted while studying the code
Diffstat (limited to 'usr.sbin/httpd')
-rw-r--r--usr.sbin/httpd/http.h6
-rw-r--r--usr.sbin/httpd/httpd.c4
-rw-r--r--usr.sbin/httpd/server_fcgi.c8
-rw-r--r--usr.sbin/httpd/server_http.c6
4 files changed, 12 insertions, 12 deletions
diff --git a/usr.sbin/httpd/http.h b/usr.sbin/httpd/http.h
index 7e67a5c85d6..c03c5d5cace 100644
--- a/usr.sbin/httpd/http.h
+++ b/usr.sbin/httpd/http.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: http.h,v 1.8 2014/09/05 15:06:05 reyk Exp $ */
+/* $OpenBSD: http.h,v 1.9 2014/09/29 19:30:47 deraadt Exp $ */
/*
* Copyright (c) 2012 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -66,7 +66,7 @@ enum httpmethod {
/* WebDAV Redirect Reference Resources, RFC 4437 */
HTTP_METHOD_MKREDIRECTREF,
HTTP_METHOD_UPDATEREDIRECTREF,
-
+
/* WebDAV Search, RFC 5323 */
HTTP_METHOD_SEARCH,
@@ -108,7 +108,7 @@ struct http_method {
{ HTTP_METHOD_MERGE, "MERGE" }, \
{ HTTP_METHOD_BASELINE_CONTROL, "BASELINE-CONTROL" }, \
{ HTTP_METHOD_MKACTIVITY, "MKACTIVITY" }, \
- { HTTP_METHOD_ORDERPATCH, "ORDERPATCH" }, \
+ { HTTP_METHOD_ORDERPATCH, "ORDERPATCH" }, \
{ HTTP_METHOD_ACL, "ACL" }, \
{ HTTP_METHOD_MKREDIRECTREF, "MKREDIRECTREF" }, \
{ HTTP_METHOD_UPDATEREDIRECTREF, "UPDATEREDIRECTREF" }, \
diff --git a/usr.sbin/httpd/httpd.c b/usr.sbin/httpd/httpd.c
index 9284eb77c42..34f2f3dee70 100644
--- a/usr.sbin/httpd/httpd.c
+++ b/usr.sbin/httpd/httpd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: httpd.c,v 1.21 2014/09/05 10:04:20 reyk Exp $ */
+/* $OpenBSD: httpd.c,v 1.22 2014/09/29 19:30:47 deraadt Exp $ */
/*
* Copyright (c) 2014 Reyk Floeter <reyk@openbsd.org>
@@ -661,7 +661,7 @@ evbuffer_getline(struct evbuffer *evb)
free(str);
return (NULL);
}
-
+
str[i] = '\0';
if ((i + 1) < len) {
diff --git a/usr.sbin/httpd/server_fcgi.c b/usr.sbin/httpd/server_fcgi.c
index c51d4b5516d..19cf568e2cb 100644
--- a/usr.sbin/httpd/server_fcgi.c
+++ b/usr.sbin/httpd/server_fcgi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server_fcgi.c,v 1.38 2014/09/02 16:20:41 reyk Exp $ */
+/* $OpenBSD: server_fcgi.c,v 1.39 2014/09/29 19:30:47 deraadt Exp $ */
/*
* Copyright (c) 2014 Florian Obser <florian@openbsd.org>
@@ -129,7 +129,7 @@ server_fcgi(struct httpd *env, struct client *clt)
} else {
struct sockaddr_un sun;
size_t len;
-
+
if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1)
goto fail;
@@ -476,8 +476,8 @@ server_fcgi_read(struct bufferevent *bev, void *arg)
EVBUFFER_DATA(clt->clt_srvevb);
DPRINTF("%s: record header: version %d type %d id %d "
"content len %d padding %d", __func__,
- h->version, h->type, ntohs(h->id),
- ntohs(h->content_len), h->padding_len);
+ h->version, h->type, ntohs(h->id),
+ ntohs(h->content_len), h->padding_len);
clt->clt_fcgi_type = h->type;
clt->clt_fcgi_toread = ntohs(h->content_len);
clt->clt_fcgi_padding_len = h->padding_len;
diff --git a/usr.sbin/httpd/server_http.c b/usr.sbin/httpd/server_http.c
index 3735131b88f..563f50d0365 100644
--- a/usr.sbin/httpd/server_http.c
+++ b/usr.sbin/httpd/server_http.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server_http.c,v 1.50 2014/09/15 08:00:27 reyk Exp $ */
+/* $OpenBSD: server_http.c,v 1.51 2014/09/29 19:30:47 deraadt Exp $ */
/*
* Copyright (c) 2006 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -340,7 +340,7 @@ server_read_http(struct bufferevent *bev, void *arg)
case HTTP_METHOD_MERGE:
case HTTP_METHOD_BASELINE_CONTROL:
case HTTP_METHOD_MKACTIVITY:
- case HTTP_METHOD_ORDERPATCH:
+ case HTTP_METHOD_ORDERPATCH:
case HTTP_METHOD_ACL:
case HTTP_METHOD_MKREDIRECTREF:
case HTTP_METHOD_UPDATEREDIRECTREF:
@@ -554,7 +554,7 @@ void
server_reset_http(struct client *clt)
{
struct server *srv = clt->clt_srv;
-
+
server_httpdesc_free(clt->clt_descreq);
server_httpdesc_free(clt->clt_descresp);
clt->clt_headerlen = 0;