From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 1/3] httpd: allow running if ReverseProxy is missing
Date: Sun, 28 Feb 2016 05:42:54 +0000 [thread overview]
Message-ID: <20160228054256.10194-1-e@80x24.org> (raw)
Not everybody will be running this behind a ReverseProxy;
but it's probably the likely configuration. Anyways,
warn about this and also about Deflater being missing.
---
examples/public-inbox.psgi | 20 +++++++++++++-------
script/public-inbox-httpd | 24 +++++++++++++++---------
2 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/examples/public-inbox.psgi b/examples/public-inbox.psgi
index acceba3..0d11c19 100644
--- a/examples/public-inbox.psgi
+++ b/examples/public-inbox.psgi
@@ -9,21 +9,27 @@ use PublicInbox::WWW;
PublicInbox::WWW->preload;
use Plack::Request;
use Plack::Builder;
-my $have_deflater = eval { require Plack::Middleware::Deflater; 1 };
my $www = PublicInbox::WWW->new;
builder {
enable 'Chunked';
- if ($have_deflater) {
+ eval {
enable 'Deflater',
- content_type => [ 'text/html', 'text/plain',
- 'application/atom+xml' ];
- }
-
+ content_type => [ qw(
+ text/html
+ text/plain
+ application/atom+xml
+ )]
+ };
+ $@ and warn
+"Plack::Middleware::Deflater missing, bandwidth will be wasted\n";
# Enable to ensure redirects and Atom feed URLs are generated
# properly when running behind a reverse proxy server which
# sets X-Forwarded-For and X-Forwarded-Proto request headers.
# See Plack::Middleware::ReverseProxy documentation for details
- enable 'ReverseProxy';
+ eval { enable 'ReverseProxy' };
+ $@ and warn
+"Plack::Middleware::ReverseProxy missing,\n",
+"URL generation for redirects may be wrong if behind a reverse proxy\n";
enable 'Head';
sub { $www->call(@_) };
diff --git a/script/public-inbox-httpd b/script/public-inbox-httpd
index 6109af0..19315bb 100755
--- a/script/public-inbox-httpd
+++ b/script/public-inbox-httpd
@@ -24,18 +24,24 @@ my $refresh = sub {
PublicInbox::WWW->preload;
my $www = PublicInbox::WWW->new;
$app = eval {
- my $deflate_types = eval {
- require Plack::Middleware::Deflater;
- [ 'text/html', 'text/plain',
- 'application/atom+xml' ]
- };
builder {
enable 'Chunked';
- if ($deflate_types) {
+ eval {
enable 'Deflater',
- content_type => $deflate_types
- }
- enable 'ReverseProxy';
+ content_type => [ qw(
+ text/html
+ text/plain
+ application/atom+xml
+ )]
+ };
+ $@ and warn
+"Plack::Middleware::Deflater missing, bandwidth will be wasted\n";
+
+ eval { enable 'ReverseProxy' };
+ $@ and warn
+"Plack::Middleware::ReverseProxy missing,\n",
+"URL generation for redirects may be wrong if behind a reverse proxy\n";
+
enable 'Head';
sub { $www->call(@_) };
};
--
EW
next reply other threads:[~2016-02-28 5:42 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-28 5:42 Eric Wong [this message]
2016-02-28 5:42 ` [PATCH 2/3] MANIFEST: update (generate via "git ls-files") Eric Wong
2016-02-28 5:42 ` [PATCH 3/3] searchmsg: update + fix license header Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160228054256.10194-1-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).