X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FHTTPD.pm;h=715e453841be3fd4fe0b2a1d389d299a8a24ab15;hb=93a7b219d58aad86438cbf3cbf4318a889831ac1;hp=47f5a01a786daa8e7d0c6bf859cfd417541aa7c3;hpb=9bd675d33ad1e49bd2ebe12a1d216216e61380de;p=public-inbox.git

diff --git a/lib/PublicInbox/HTTPD.pm b/lib/PublicInbox/HTTPD.pm
index 47f5a01a..715e4538 100644
--- a/lib/PublicInbox/HTTPD.pm
+++ b/lib/PublicInbox/HTTPD.pm
@@ -1,19 +1,20 @@
-# Copyright (C) 2016-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # wraps a listen socket for HTTP and links it to the PSGI app in
 # public-inbox-httpd
 package PublicInbox::HTTPD;
+use v5.10.1;
 use strict;
-use warnings;
-use Plack::Util;
-require PublicInbox::HTTPD::Async;
-require PublicInbox::Daemon;
+use Plack::Util ();
+use Plack::Builder;
+use PublicInbox::HTTP;
+use PublicInbox::HTTPD::Async;
 
 sub pi_httpd_async { PublicInbox::HTTPD::Async->new(@_) }
 
 sub new {
-	my ($class, $sock, $app) = @_;
+	my ($class, $sock, $app, $client) = @_;
 	my $n = getsockname($sock) or die "not a socket: $sock $!\n";
 	my ($host, $port) = PublicInbox::Daemon::host_with_port($n);
 
@@ -23,7 +24,8 @@ sub new {
 		SCRIPT_NAME => '',
 		'psgi.version' => [ 1, 1 ],
 		'psgi.errors' => \*STDERR,
-		'psgi.url_scheme' => 'http',
+		'psgi.url_scheme' => $client->can('accept_SSL') ?
+					'https' : 'http',
 		'psgi.nonblocking' => Plack::Util::TRUE,
 		'psgi.streaming' => Plack::Util::TRUE,
 		'psgi.run_once'	 => Plack::Util::FALSE,
@@ -36,15 +38,45 @@ sub new {
 
 		# XXX unstable API!, only GitHTTPBackend needs
 		# this to limit git-http-backend(1) parallelism.
-		# The rest of our PSGI code is generic, relying
-		# on "pull" model using "getline" to prevent
-		# over-buffering.
+		# We also check for the truthiness of this to
+		# detect when to use async paths for slow blobs
 		'pi-httpd.async' => \&pi_httpd_async
 	);
-	bless {
-		app => $app,
-		env => \%env
-	}, $class;
+	bless { app => $app, env => \%env }, $class;
+}
+
+my %httpds; # per-listen-FD mapping for HTTPD->{env}->{SERVER_<NAME|PORT>}
+my $default_app; # ugh...
+
+sub refresh {
+	if (@main::ARGV) {
+		eval { $default_app = Plack::Util::load_psgi(@ARGV) };
+		if ($@) {
+			die $@,
+"$0 runs in /, command-line paths must be absolute\n";
+		}
+	} else {
+		require PublicInbox::WWW;
+		my $www = PublicInbox::WWW->new;
+		$www->preload;
+		$default_app = builder {
+			eval { enable 'ReverseProxy' };
+			$@ and warn <<EOM;
+Plack::Middleware::ReverseProxy missing,
+URL generation for redirects may be wrong if behind a reverse proxy
+EOM
+			enable 'Head';
+			sub { $www->call(@_) };
+		};
+	}
+	%httpds = (); # invalidate cache
+}
+
+sub post_accept { # Listener->{post_accept}
+	my ($client, $addr, $srv) = @_; # $_[3] - tls_wrap (unused)
+	my $httpd = $httpds{fileno($srv)} //=
+				__PACKAGE__->new($srv, $default_app, $client);
+	PublicInbox::HTTP->new($client, $addr, $httpd),
 }
 
 1;