theory at bricolage
Mar 6, 2009, 3:43 PM
Post #1 of 1
(461 views)
Permalink
|
|
[8459] Fixed errors reported by Adrian Yee.
|
|
Revision: 8459
Author: theory
Date: 2009-03-06 15:43:59 -0800 (Fri, 06 Mar 2009)
ViewCVS: http://viewsvn.bricolage.cc/?rev=8459&view=rev
Log Message:
-----------
Fixed errors reported by Adrian Yee.
Modified Paths:
--------------
bricolage/trunk/lib/Bric/Util/ApacheReq.pm
Modified: bricolage/trunk/lib/Bric/Util/ApacheReq.pm
===================================================================
--- bricolage/trunk/lib/Bric/Util/ApacheReq.pm 2009-03-06 23:25:48 UTC (rev 8458)
+++ bricolage/trunk/lib/Bric/Util/ApacheReq.pm 2009-03-06 23:43:59 UTC (rev 8459)
@@ -143,9 +143,10 @@
my $port;
if ( SSL_ENABLE && (ALWAYS_USE_SSL || $p{ssl}) ) {
$http .= 's';
- $port = SSL_PORT eq '*' || SSL_PORT == 443 ? '' : ':' . SSL_PORT;
+ # Yes string comparisons, because the constants are inlined.
+ $port = SSL_PORT eq '*' || SSL_PORT eq '443' ? '' : ':' . SSL_PORT;
} else {
- $port = LISTEN_PORT eq '*' || LISTEN_PORT == 80 ? '' : ':' . LISTEN_PORT;
+ $port = LISTEN_PORT eq '*' || LISTEN_PORT eq '80' ? '' : ':' . LISTEN_PORT;
}
return "$http://" . $req->hostname . $port . (defined $p{uri} ? $p{uri} : '/');
}
|
