qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-23 23:46:16 +02:00
Code

[backfire] merge r23952

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@23953 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2010-11-10 20:53:10 +00:00
parent 766ef77087
commit 6771f8e41d
4 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/uhttpd/Makefile
View File

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=uhttpd PKG_NAME:=uhttpd
PKG_RELEASE:=18 PKG_RELEASE:=19
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
PKG_BUILD_DEPENDS := libcyassl liblua PKG_BUILD_DEPENDS := libcyassl liblua

21
package/uhttpd/src/uhttpd-utils.c
View File

@ -474,6 +474,7 @@ struct path_info * uh_path_lookup(struct client *cl, const char *url)
char *docroot = cl->server->conf->docroot; char *docroot = cl->server->conf->docroot;
char *pathptr = NULL; char *pathptr = NULL;
int slash = 0;
int no_sym = cl->server->conf->no_symlinks; int no_sym = cl->server->conf->no_symlinks;
int i = 0; int i = 0;
struct stat s; struct stat s;
@ -516,7 +517,7 @@ struct path_info * uh_path_lookup(struct client *cl, const char *url)
} }
/* create canon path */ /* 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] == '/') ) 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)); memcpy(buffer, path_phys, sizeof(buffer));
pathptr = &buffer[strlen(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)); strncat(buffer, cl->server->conf->index_file, sizeof(buffer));

1
package/uhttpd/src/uhttpd-utils.h
View File

@ -49,6 +49,7 @@ struct path_info {
char *name; char *name;
char *info; char *info;
char *query; char *query;
int redirected;
struct stat stat; struct stat stat;
}; };

3
package/uhttpd/src/uhttpd.c
View File

@ -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 ) if( (pin = uh_path_lookup(cl, req->url)) != NULL )
{ {
/* auth ok? */ /* auth ok? */
if( uh_auth_check(cl, req, pin) ) if( !pin->redirected && uh_auth_check(cl, req, pin) )
uh_dispatch_request(cl, req, pin); uh_dispatch_request(cl, req, pin);
} }
@ -1089,4 +1089,3 @@ int main (int argc, char **argv)
return 0; return 0;
} }