[backfire] merge r23952

SVN-Revision: 23953

diff --git a/package/uhttpd/Makefile b/package/uhttpd/Makefile
index 943cb73ab2e1566ba4696e432563fdc970e184db..9e0069f6712f8caf9a146a3f6c222f0a72fb2201 100644 (file)
--- a/package/uhttpd/Makefile
+++ b/package/uhttpd/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uhttpd
-PKG_RELEASE:=18
+PKG_RELEASE:=19
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 PKG_BUILD_DEPENDS := libcyassl liblua

diff --git a/package/uhttpd/src/uhttpd-utils.c b/package/uhttpd/src/uhttpd-utils.c
index 3821eb54cb18df8328d79d583d80d3a0bd7dc4bd..55c108f2712bc59d09559881d368787e2594be75 100644 (file)
--- a/package/uhttpd/src/uhttpd-utils.c
+++ b/package/uhttpd/src/uhttpd-utils.c
@@ -474,6 +474,7 @@ struct path_info * uh_path_lookup(struct client *cl, const char *url)
        char *docroot = cl->server->conf->docroot;
        char *pathptr = NULL;
 
+       int slash = 0;
        int no_sym = cl->server->conf->no_symlinks;
        int i = 0;
        struct stat s;
@@ -516,7 +517,7 @@ struct path_info * uh_path_lookup(struct client *cl, const char *url)
        }
 
        /* create canon path */
-       for( i = strlen(buffer); i >= 0; i-- )
+       for( i = strlen(buffer), slash = (buffer[max(0, i-1)] == '/'); i >= 0; i-- )
        {
                if( (buffer[i] == 0) || (buffer[i] == '/') )
                {
@@ -567,7 +568,23 @@ struct path_info * uh_path_lookup(struct client *cl, const char *url)
                        memcpy(buffer, path_phys, sizeof(buffer));
                        pathptr = &buffer[strlen(buffer)];
 
-                       if( cl->server->conf->index_file )
+                       /* if requested url resolves to a directory and a trailing slash
+                          is missing in the request url, redirect the client to the same
+                          url with trailing slash appended */
+                       if( !slash )
+                       {
+                               uh_http_sendf(cl, NULL,
+                                       "HTTP/1.1 302 Found\r\n"
+                                       "Location: %s%s%s\r\n"
+                                       "Connection: close\r\n\r\n",
+                                               &path_phys[strlen(docroot)],
+                                               p.query ? "?" : "",
+                                               p.query ? p.query : ""
+                               );
+
+                               p.redirected = 1;
+                       }
+                       else if( cl->server->conf->index_file )
                        {
                                strncat(buffer, cl->server->conf->index_file, sizeof(buffer));
 

diff --git a/package/uhttpd/src/uhttpd-utils.h b/package/uhttpd/src/uhttpd-utils.h
index 3514ce1caca730337caf04a926de0f212b5ac01a..68191a3a6ac520605cff8fe890764b69359a1efe 100644 (file)
--- a/package/uhttpd/src/uhttpd-utils.h
+++ b/package/uhttpd/src/uhttpd-utils.h
@@ -49,6 +49,7 @@ struct path_info {
        char *name;
        char *info;
        char *query;
+       int redirected;
        struct stat stat;
 };
 

diff --git a/package/uhttpd/src/uhttpd.c b/package/uhttpd/src/uhttpd.c
index a818e1c4507e58ff55f501b7bb28a7462df57e45..491452b6349c7fddddb3d6dca54e80d63f0cfca1 100644 (file)
--- a/package/uhttpd/src/uhttpd.c
+++ b/package/uhttpd/src/uhttpd.c
@@ -566,7 +566,7 @@ static void uh_mainloop(struct config *conf, fd_set serv_fds, int max_fd)
                                                if( (pin = uh_path_lookup(cl, req->url)) != NULL )
                                                {
                                                        /* auth ok? */
-                                                       if( uh_auth_check(cl, req, pin) )
+                                                       if( !pin->redirected && uh_auth_check(cl, req, pin) )
                                                                uh_dispatch_request(cl, req, pin);
                                                }
 
@@ -1089,4 +1089,3 @@ int main (int argc, char **argv)
 
        return 0;
 }
-