diff options
| author |   florian <florian@openbsd.org> | 2014-08-07 12:43:22 +0000 |
|---|---|---|
| committer | florian <florian@openbsd.org> | 2014-08-07 12:43:22 +0000 |
| commit | e1cb20cbe715bd45fbd7ba4cd2782c8c0964e921 (patch) | |
| tree | 803658e56b3031210fa5f0fa60e2a977cea77032 | |
| parent | Opportunistically try to parse "Status: $code" in the very first (diff) | |
| download | wireguard-openbsd-e1cb20cbe715bd45fbd7ba4cd2782c8c0964e921.tar.xz wireguard-openbsd-e1cb20cbe715bd45fbd7ba4cd2782c8c0964e921.zip | |
Don't try to ouput FCGI_STDERR into error.log if there is no data.
Problem noticed by naddy@, OK reyk@
| -rw-r--r-- | usr.sbin/httpd/server_fcgi.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.sbin/httpd/server_fcgi.c b/usr.sbin/httpd/server_fcgi.c index 7533cd5b9b0..6850dd0a30f 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.28 2014/08/07 10:52:34 florian Exp $ */ +/* $OpenBSD: server_fcgi.c,v 1.29 2014/08/07 12:43:22 florian Exp $ */ /* * Copyright (c) 2014 Florian Obser <florian@openbsd.org> @@ -478,7 +478,8 @@ server_fcgi_read(struct bufferevent *bev, void *arg) /* fallthrough if content_len == 0 */ case FCGI_READ_CONTENT: - if (clt->clt_fcgi_type == FCGI_STDERR && len) { + if (clt->clt_fcgi_type == FCGI_STDERR && + EVBUFFER_LENGTH(clt->clt_srvevb) > 0) { if ((ptr = get_string( EVBUFFER_DATA(clt->clt_srvevb), EVBUFFER_LENGTH(clt->clt_srvevb))) |