fix callback when servlet is not at root

itaibenari · itaibenari · commit 831f02af638c · 2013-11-12T11:07:03.000+02:00
diff --git a/cloudinary-taglib/src/main/java/com/cloudinary/taglib/CloudinaryUploadTag.java b/cloudinary-taglib/src/main/java/com/cloudinary/taglib/CloudinaryUploadTag.java
@@ -3,7 +3,7 @@
 import java.io.IOException;
 import java.util.*;
 
-import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.PageContext;
 import javax.servlet.jsp.tagext.SimpleTagSupport;
@@ -291,11 +291,11 @@ private void buildCallbackUrl(Map options) {
         if (callback == null || callback.isEmpty()) callback = "/cloudinary_cors.html";
         if (!callback.matches("^https?://")) {
             PageContext context = (PageContext) getJspContext();
-            ServletRequest request = context.getRequest();
+            HttpServletRequest request = (HttpServletRequest) context.getRequest();
             String callbackUrl = request.getScheme() + "://" + request.getServerName();
             if (request.getScheme().equals("https") && request.getServerPort() != 443 ||
                     request.getScheme().equals("http") && request.getServerPort() != 80) {
-                callbackUrl += ":" + request.getServerPort();
+                callbackUrl += ":" + request.getServerPort() + request.getContextPath();
             }
             callbackUrl += callback;
             options.put("callback", callbackUrl);
