diff options
| author | Andreas Fitzek <andreas.fitzek@iaik.tugraz.at> | 2016-02-09 08:07:45 +0100 |
|---|---|---|
| committer | Andreas Fitzek <andreas.fitzek@iaik.tugraz.at> | 2016-02-09 08:07:45 +0100 |
| commit | dfde0e5bcde5ab48940ee91b72c8251492ffdc21 (patch) | |
| tree | bdb41c1fb4c9550c017f80318b23dabac46556c8 | |
| parent | 40d43a9b8688eb0a1c64aff8e4e6b4ee0b763a2c (diff) | |
| parent | 4397feaa51771d4c2205623519077d4bb0384c88 (diff) | |
| download | pdf-as-4-dfde0e5bcde5ab48940ee91b72c8251492ffdc21.tar.gz pdf-as-4-dfde0e5bcde5ab48940ee91b72c8251492ffdc21.tar.bz2 pdf-as-4-dfde0e5bcde5ab48940ee91b72c8251492ffdc21.zip | |
Merge branch 'master' of gitlab.iaik.tugraz.at:afitzek/pdf-as-4
| -rw-r--r-- | build.gradle | 2 | ||||
| -rw-r--r-- | pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ProvidePDFServlet.java | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/build.gradle b/build.gradle index 1c2c484c..ef6be4d7 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ task wrapper(type: Wrapper) { allprojects { apply plugin: 'com.github.ben-manes.versions' repositories { mavenCentral() } - version = '4.0.8' + version = '4.0.9' } configurations { diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ProvidePDFServlet.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ProvidePDFServlet.java index 6ff6ccf7..815d532e 100644 --- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ProvidePDFServlet.java +++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ProvidePDFServlet.java @@ -101,10 +101,15 @@ public class ProvidePDFServlet extends HttpServlet { String template = PdfAsHelper.getInvokeRedirectTemplateSL(); URL url = new URL(invokeURL); + int p=url.getPort(); + //no port, but http or https --> use default port + if((url.getProtocol().equalsIgnoreCase("https") || url.getProtocol().equalsIgnoreCase("http")) && p == -1){ + p=url.getDefaultPort(); + } String invokeUrlProcessed = url.getProtocol() + "://" + // "http" + ":// url.getHost() + // "myhost" ":" + // ":" - url.getPort() + // "8080" + p + // "8080" url.getPath(); template = template.replace("##INVOKE_URL##", invokeUrlProcessed); |