Merge branch 'master' of http://github.com/techfreek/go-ipfs

core/corehttp/redirect.go

@@ -9,7 +9,7 @@ import (
 func RedirectOption(path string, redirect string) ServeOption {
 	handler := &redirectHandler{redirect}
 	return func(n *core.IpfsNode, mux *http.ServeMux) (*http.ServeMux, error) {
-		mux.Handle("/"+path, handler)
+		mux.Handle("/"+path+"/", handler)
 		return mux, nil
 	}
 }

test/sharness/t0110-gateway.sh

@@ -12,6 +12,8 @@ test_init_ipfs
 test_config_ipfs_gateway_readonly "/ip4/0.0.0.0/tcp/5002"
 test_launch_ipfs_daemon
 
+webui_hash="QmXdu7HWdV6CUaUabd9q2ZeA4iHZLVyDRj3Gi4dsJsWjbr"
+
 # TODO check both 5001 and 5002.
 # 5001 should have a readable gateway (part of the API)
 # 5002 should have a readable gateway (using ipfs config Addresses.Gateway)
@@ -63,6 +65,24 @@ test_expect_success "GET invalid path errors" '
   test_must_fail wget http://127.0.0.1:5002/12345
 '
 
+
+test_expect_success "GET /webui returns code expected" '
+  echo "HTTP/1.1 302 Found" | head -c 18 > expected &&
+  echo "HTTP/1.1 301 Moved Permanently" | head -c 18 > also_ok &&
+  curl -I http://127.0.0.1:5001/webui | head -c 18 > actual1 &&
+  (test_cmp expected actual1 || test_cmp actual1 also_ok) &&
+  rm actual1
+'
+
+test_expect_success "GET /webui/ returns code expected" '
+  curl -I http://127.0.0.1:5001/webui/ | head -c 18 > actual2 &&
+  (test_cmp expected actual2 || test_cmp actual2 also_ok) &&
+  rm expected &&
+  rm also_ok &&
+  rm actual2
+'
+
+
 test_kill_ipfs_daemon
 
 test_done