From 8e2df567d809c443cd4be73443a576f0345015ae Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sun, 21 Jun 2009 00:00:54 +0000
Subject: [PATCH] Pluck of revision 546257906e9b26c3a35e38967ebcaa54098d969f
from branch i2p.i2p.zzz.test
---------------------------------------------------------------------------------------
* ReseedHandler: - check for upper case HREF to be compatible with
apache indexes
---
.../java/src/net/i2p/router/web/ReseedHandler.java | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ReseedHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ReseedHandler.java
index e701ede995..ceb8a280ed 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ReseedHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ReseedHandler.java
@@ -137,11 +137,16 @@ public class ReseedHandler {
* Fetch a directory listing and then up to 200 routerInfo files in the listing.
* The listing must contain (exactly) strings that match:
* href="routerInfo-{hash}.dat">
+ * OR
+ * HREF="routerInfo-{hash}.dat">
* and then it fetches the files
* {seedURL}routerInfo-{hash}.dat
* after appending a '/' to seedURL if it doesn't have one.
* Essentially this means that the seedURL must be a directory, it
* can't end with 'index.html', for example.
+ *
+ * Jetty directory listings are not compatible, as they look like
+ * HREF="/full/path/to/routerInfo-...
**/
private void reseedOne(String seedURL, boolean echoStatus) {
@@ -165,8 +170,11 @@ public class ReseedHandler {
int total = 0;
while (total++ < 1000) {
int start = content.indexOf("href=\"routerInfo-", cur);
- if (start < 0)
- break;
+ if (start < 0) {
+ start = content.indexOf("HREF=\"routerInfo-", cur);
+ if (start < 0)
+ break;
+ }
int end = content.indexOf(".dat\">", start);
String name = content.substring(start+"href=\"routerInfo-".length(), end);
--
GitLab