svn commit: r1801097 - in /ofbiz/branches/release16.11: ./ framework/webapp/src/main/java/org/apache/ofbiz/webapp/OfbizUrlBuilder.java

Author: jleroux
Date: Thu Jul  6 19:20:37 2017
New Revision: 1801097

URL: http://svn.apache.org/viewvc?rev=1801097&view=rev
Log:
"Applied fix from trunk framework for revision: 1801094"
------------------------------------------------------------------------
r1801094 | jleroux | 2017-07-06 21:02:01 +0200 (jeu. 06 juil. 2017) | 16 lignes

Fixed: Missing secure port in URLs when sending mails
(OFBIZ-9449)
While working on an issue reported by Pierre Gaudin on user ML
https://s.apache.org/gDo3, here quoted:

I found another issue while testing: the port 8443 is missing  in the URL used
underneath by the form reported by Pierre.

It was broken by OFBIZ-9206 where I removed the value of port.https in
url.properties.

It's not an issue if you set the value of port.https, or let it empty when
using a SSL certificate on a production server. But if you try locally
(localhost) then the URL misses the 8443 port.

Solution append 8443 as default secure port when using localhost
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release16.11/   (props changed)
    ofbiz/branches/release16.11/framework/webapp/src/main/java/org/apache/ofbiz/webapp/OfbizUrlBuilder.java

Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul  6 19:20:37 2017
@@ -10,5 +10,5 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853
+/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094
 /ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979,1782498,1782520

Modified: ofbiz/branches/release16.11/framework/webapp/src/main/java/org/apache/ofbiz/webapp/OfbizUrlBuilder.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/framework/webapp/src/main/java/org/apache/ofbiz/webapp/OfbizUrlBuilder.java?rev=1801097&r1=1801096&r2=1801097&view=diff
==============================================================================
--- ofbiz/branches/release16.11/framework/webapp/src/main/java/org/apache/ofbiz/webapp/OfbizUrlBuilder.java (original)
+++ ofbiz/branches/release16.11/framework/webapp/src/main/java/org/apache/ofbiz/webapp/OfbizUrlBuilder.java Thu Jul  6 19:20:37 2017
@@ -162,6 +162,8 @@ public final class OfbizUrlBuilder {
             buffer.append(server);
             if (!webSiteProps.getHttpsPort().isEmpty()) {
                 buffer.append(":").append(webSiteProps.getHttpsPort());
+            } else if ("localhost".equals(server)) {
+                buffer.append(":").append("8443"); // We suppose that when localhost is used the default secure port is 8443
             }
         } else {
             String server = webSiteProps.getHttpHost();