From 46bfccb0d57ba75d195be7afa54e37ba0d4321d1 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 12 Jun 2014 18:52:41 -0400
Subject: [PATCH] Fix cloning repositories with + in their names
---
src/main/java/WEB-INF/web.xml | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/src/main/java/WEB-INF/web.xml b/src/main/java/WEB-INF/web.xml
index c082b94..77456d4 100644
--- a/src/main/java/WEB-INF/web.xml
+++ b/src/main/java/WEB-INF/web.xml
@@ -56,12 +56,8 @@
<servlet-name>GitServlet</servlet-name>
<url-pattern>/git/*</url-pattern>
</servlet-mapping>
- <servlet>
- <servlet-name>GitServlet2</servlet-name>
- <servlet-class>com.gitblit.servlet.GitServlet</servlet-class>
- </servlet>
<servlet-mapping>
- <servlet-name>GitServlet2</servlet-name>
+ <servlet-name>GitServlet</servlet-name>
<url-pattern>/r/*</url-pattern>
</servlet-mapping>
@@ -165,6 +161,20 @@
<url-pattern>/logo.png</url-pattern>
</servlet-mapping>
+
+ <!-- PT Servlet
+ <url-pattern> MUST match:
+ * Wicket Filter ignorePaths parameter -->
+ <servlet>
+ <servlet-name>PtServlet</servlet-name>
+ <servlet-class>com.gitblit.servlet.PtServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>PtServlet</servlet-name>
+ <url-pattern>/pt</url-pattern>
+ </servlet-mapping>
+
+
<!-- Branch Graph Servlet
<url-pattern> MUST match:
* Wicket Filter ignorePaths parameter -->
@@ -189,7 +199,6 @@
<url-pattern>/robots.txt</url-pattern>
</servlet-mapping>
-
<!-- Git Access Restriction Filter
<url-pattern> MUST match:
* GitServlet
@@ -202,6 +211,10 @@
<filter-mapping>
<filter-name>GitFilter</filter-name>
<url-pattern>/git/*</url-pattern>
+ </filter-mapping>
+ <filter-mapping>
+ <filter-name>GitFilter</filter-name>
+ <url-pattern>/r/*</url-pattern>
</filter-mapping>
@@ -300,7 +313,7 @@
* PagesFilter <url-pattern>
* PagesServlet <url-pattern>
* com.gitblit.Constants.PAGES_PATH -->
- <param-value>r/,git/,feed/,zip/,federation/,rpc/,pages/,robots.txt,logo.png,graph/,sparkleshare/</param-value>
+ <param-value>r/,git/,pt,feed/,zip/,federation/,rpc/,pages/,robots.txt,logo.png,graph/,sparkleshare/</param-value>
</init-param>
</filter>
<filter-mapping>
@@ -308,4 +321,4 @@
<url-pattern>/*</url-pattern>
</filter-mapping>
-</web-app>
\ No newline at end of file
+</web-app>
--
Gitblit v1.9.1