Merged #149 "Repo creation with initial commit fails if user does not have ...

James Moger

2014-09-04 ddcebbd982d81dabf8cb1c89f60f9b876a23b58c

 src/main/java/com/gitblit/servlet/RawServlet.java

@@ -95,20 +95,17 @@
         baseURL = baseURL.substring(0, baseURL.length() - 1);
      }

      char fsc = '!';
      char c = GitblitContext.getManager(IRuntimeManager.class).getSettings().getChar(Keys.web.forwardSlashCharacter, '/');
      if (c != '/') {
         fsc = c;
      }
      if (branch != null) {
         char fsc = '!';
         char c = GitblitContext.getManager(IRuntimeManager.class).getSettings().getChar(Keys.web.forwardSlashCharacter, '/');
         if (c != '/') {
            fsc = c;
         }
         branch = branch.replace('/', fsc);
      }

      String encodedPath = path == null ? "" : path.replace(' ', '-');
      try {
         encodedPath = URLEncoder.encode(encodedPath, "UTF-8");
      } catch (UnsupportedEncodingException e) {
      }
      encodedPath = encodedPath.replace('/', fsc);
      return baseURL + Constants.RAW_PATH + repository + "/" + (branch == null ? "" : (branch + "/" + (path == null ? "" : encodedPath)));
   }

@@ -133,7 +130,8 @@
      if (path.endsWith("/")) {
         path = path.substring(0, path.length() - 1);
      }
      return path;
      char c = runtimeManager.getSettings().getChar(Keys.web.forwardSlashCharacter, '/');
      return path.replace('!', '/').replace(c, '/');
   }

   protected boolean renderIndex() {
@@ -257,6 +255,15 @@
                  // load, interpret, and serve text content as UTF-8
                  String [] encodings = runtimeManager.getSettings().getStrings(Keys.web.blobEncodings).toArray(new String[0]);
                  String content = JGitUtils.getStringContent(r, commit.getTree(), requestedPath, encodings);
                  if (content == null) {
                     logger.error("RawServlet Failed to load {} {} {}", repository, commit.getName(), path);
                     String str = MessageFormat.format(
                           "# Error\nSorry, the requested resource **{0}** was not found.",
                           requestedPath);
                     response.setStatus(HttpServletResponse.SC_NOT_FOUND);
                     error(response, str);
                     return;
                  }

                  byte [] bytes = content.getBytes(Constants.ENCODING);
                  response.setContentLength(bytes.length);
@@ -414,11 +421,8 @@
      }
   }

   private void streamFromRepo(HttpServletResponse response, Repository repository,
   protected void streamFromRepo(HttpServletResponse response, Repository repository,
         RevCommit commit, String requestedPath) throws IOException {

      response.setDateHeader("Last-Modified", JGitUtils.getCommitDate(commit).getTime());
      response.setHeader("Cache-Control", "public, max-age=3600, must-revalidate");

      RevWalk rw = new RevWalk(repository);
      TreeWalk tw = new TreeWalk(repository);
@@ -450,9 +454,8 @@
      response.flushBuffer();
   }

   private void sendContent(HttpServletResponse response, Date date, InputStream is) throws ServletException, IOException {
      response.setDateHeader("Last-Modified", date.getTime());
      response.setHeader("Cache-Control", "public, max-age=3600, must-revalidate");
   protected void sendContent(HttpServletResponse response, Date date, InputStream is) throws ServletException, IOException {

      try {
         byte[] tmp = new byte[8192];
         int len = 0;