[Rt-commit] rt branch, 4.2/refactor-rt-server, repushed
Alex Vandiver
alexmv at bestpractical.com
Wed Jul 17 22:11:01 EDT 2013
The branch 4.2/refactor-rt-server was deleted and repushed:
was 5dcb6a09115a8dbbaada237e10786c3f1f229099
now 2234b96f58b9c26f7eca622aaf0c6dcac9636169
1: bb7f758 ! 1: 308a9e7 Refactor rt-server.in into RT::PlackRunner
@@ -97,28 +97,14 @@
+ }
+}
+
-+# Override to not default to port 5000
++# Don't assume port 5000 with no port or socket supplied; this allows
++# the WebPort default to kick in (above), and also to provide useful
++# error messages when starting FCGI without any options.
+sub mangle_host_port_socket {
+ my($self, $host, $port, $socket, @listen) = @_;
-+
-+ for my $listen (reverse @listen) {
-+ if ($listen =~ /:\d+$/) {
-+ ($host, $port) = split /:/, $listen, 2;
-+ $host = undef if $host eq '';
-+ } else {
-+ $socket ||= $listen;
-+ }
-+ }
-+
-+ unless (@listen) {
-+ if ($socket) {
-+ @listen = ($socket);
-+ } elsif ($port) {
-+ @listen = ($host ? "$host:$port" : ":$port");
-+ }
-+ }
-+
-+ return host => $host, port => $port, listen => \@listen, socket => $socket;
++ return $self->SUPER::mangle_host_port_socket(@_)
++ if @listen or $port or $socket;
++ return host => $host, port => $port, socket => $socket, listen => \@listen;
+}
+
+sub prepare_devel {
2: 5dcb6a0 = 2: 2234b96 Catch and fix var/ when rt-server is incorrectly run as root
More information about the Rt-commit
mailing list