Merged with the default branch.1.9.0-1

2 files changed, 8 insertions, 6 deletions

diff --git a/src/java/nginx/unit/Context.java b/src/java/nginx/unit/Context.java
index 643a336b..f6d5e339 100644
--- a/src/java/nginx/unit/Context.java
+++ b/src/java/nginx/unit/Context.java
@@ -306,7 +306,7 @@ public class Context implements ServletContext, InitParams
                 PrintWriter writer = response.getWriter();
 
                 for (String n : ls) {
-                    writer.println("<a href=\"" + n + "\">" + n + "</a><br>"); 
+                    writer.println("<a href=\"" + n + "\">" + n + "</a><br>");
                 }
 
                 writer.close();
@@ -547,7 +547,7 @@ public class Context implements ServletContext, InitParams
                     j = j.getParent();
                 }
             }
-            system_loader = j; 
+            system_loader = j;
         }
 
         private boolean isSystemPath(String path)
@@ -1733,7 +1733,7 @@ public class Context implements ServletContext, InitParams
 
                 @Override
                 public FileVisitResult visitFile(
-                  Path file, BasicFileAttributes attrs) 
+                  Path file, BasicFileAttributes attrs)
                   throws IOException {
                     Files.delete(file);
                     return FileVisitResult.CONTINUE;
diff --git a/src/java/nginx/unit/Request.java b/src/java/nginx/unit/Request.java
index dc73c656..3ba46f6c 100644
--- a/src/java/nginx/unit/Request.java
+++ b/src/java/nginx/unit/Request.java
@@ -920,7 +920,7 @@ public class Request implements HttpServletRequest, DynamicPathRequest
     @Override
     public String getScheme()
     {
-        log("getScheme");
+        trace("getScheme");
 
         return getScheme(req_ptr);
     }
@@ -980,11 +980,13 @@ public class Request implements HttpServletRequest, DynamicPathRequest
     @Override
     public boolean isSecure()
     {
-        log("isSecure");
+        trace("isSecure");
 
-        return false;
+        return isSecure(req_ptr);
     }
 
+    private static native boolean isSecure(long req_ptr);
+
     @Override
     public void removeAttribute(String name)
     {