Remove repeating backslashes only on Windows

This commit is contained in:
Sergey Lyubka 2012-02-09 22:55:24 +00:00
parent 84a76fba69
commit 9d3af98a5e
3 changed files with 34 additions and 3 deletions

1
test/\/a.txt Normal file
View File

@ -0,0 +1 @@
blah

View File

@ -201,7 +201,7 @@ $num_requests++;
write_file("$root/a+.txt", '');
o("GET /a+.txt HTTP/1.0\n\n", 'HTTP/1.1 200 OK', 'URL-decoding, + in URI');
#o("GET /hh HTTP/1.0\n\n", 'HTTP/1.1 200 OK', 'GET admin URI');
o("GET /%5c/a.txt HTTP/1.0\n\n", 'blah', 'GET dir backslash');
# Test HTTP version parsing
o("GET / HTTPX/1.0\r\n\r\n", '400 Bad Request', 'Bad HTTP Version', 0);
@ -213,7 +213,8 @@ o("GET / HTTP/02.0\r\n\r\n", '505 HTTP version not supported',
# File with leading single dot
o("GET /.leading.dot.txt HTTP/1.0\n\n", 'abc123', 'Leading dot 1');
o("GET /...leading.dot.txt HTTP/1.0\n\n", 'abc123', 'Leading dot 2');
o("GET /../\\\\/.//...leading.dot.txt HTTP/1.0\n\n", 'abc123', 'Leading dot 3');
o("GET /../\\\\/.//...leading.dot.txt HTTP/1.0\n\n", 'abc123', 'Leading dot 3')
if on_windows();
o("GET .. HTTP/1.0\n\n", '400 Bad Request', 'Leading dot 4', 0);
mkdir $test_dir unless -d $test_dir;

View File

@ -1,6 +1,6 @@
#include "mongoose.c"
int main(void) {
static void test_match_prefix(void) {
assert(match_prefix("/a/", 3, "/a/b/c") == 3);
assert(match_prefix("/a/", 3, "/ab/c") == -1);
assert(match_prefix("/*/", 3, "/ab/c") == 4);
@ -25,6 +25,35 @@ int main(void) {
assert(match_prefix("**.a$|**.b$", 11, "/a/b.b/") == -1);
assert(match_prefix("**.a$|**.b$", 11, "/a/b.b") == 6);
assert(match_prefix("**.a$|**.b$", 11, "/a/b.a") == 6);
}
static void test_remove_double_dots() {
struct { char before[20], after[20]; } data[] = {
{"////a", "/a"},
{"/.....", "/."},
{"/......", "/"},
{"...", "..."},
{"/...///", "/./"},
{"/a...///", "/a.../"},
{"/.x", "/.x"},
#if defined(_WIN32)
{"/\\", "/"},
#else
{"/\\", "/\\"},
#endif
{"/a\\", "/a\\"},
};
size_t i;
for (i = 0; i < ARRAY_SIZE(data); i++) {
//printf("[%s] -> [%s]\n", data[i].before, data[i].after);
remove_double_dots_and_double_slashes(data[i].before);
assert(strcmp(data[i].before, data[i].after) == 0);
}
}
int main(void) {
test_match_prefix();
test_remove_double_dots();
return 0;
}