githttpbackend: simplify compatibility code

[public-inbox.git] / examples / public-inbox.psgi

diff --git a/examples/public-inbox.psgi b/examples/public-inbox.psgi
index a90a2bc3ae7544ebedcc5eb04d64b52750989231..98cde92d3d25566a94898264aef18c9415fab7b2 100644 (file)
--- a/examples/public-inbox.psgi
+++ b/examples/public-inbox.psgi
@@ -14,6 +14,7 @@ my $www = PublicInbox::WWW->new;
 
 # share the public-inbox code itself:
 my $src = $ENV{SRC_GIT_DIR}; # '/path/to/public-inbox.git'
+$src = PublicInbox::Git->new($src) if defined $src;
 
 builder {
        eval {
@@ -29,7 +30,7 @@ builder {
 
        # 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.
+       # sets the X-Forwarded-Proto request header.
        # See Plack::Middleware::ReverseProxy documentation for details
        eval { enable 'ReverseProxy' };
        $@ and warn
@@ -47,7 +48,9 @@ builder {
        sub {
                my ($env) = @_;
                # share public-inbox.git code!
-               if ($src && $env->{PATH_INFO} =~ m!\A/public-inbox\.git/(.*)!) {
+               if ($src && $env->{PATH_INFO} =~
+                               m!\A/(?:public-inbox(?:\.git)?/)?
+                               ($PublicInbox::GitHTTPBackend::ANY)\z!xo) {
                        PublicInbox::GitHTTPBackend::serve($env, $src, $1);
                } else {
                        $www->call($env);