From e5764c3299eb5c500b1f4e3d743ec2c780e4b6bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Wei=C3=9Fl?= Date: Sat, 31 Aug 2013 04:08:13 +0200 Subject: Test nocache option of mod_cgi and mod_esi Tests that the nocache options work and can be used independently from each other. This was broken before c8ef69c. Conflicts: lib/inets/test/httpd_basic_SUITE.erl --- lib/inets/test/httpd_basic_SUITE_data/printenv.bat | 1 + lib/inets/test/httpd_basic_SUITE_data/printenv.sh | 1 + 2 files changed, 2 insertions(+) create mode 120000 lib/inets/test/httpd_basic_SUITE_data/printenv.bat create mode 120000 lib/inets/test/httpd_basic_SUITE_data/printenv.sh (limited to 'lib/inets/test/httpd_basic_SUITE_data') diff --git a/lib/inets/test/httpd_basic_SUITE_data/printenv.bat b/lib/inets/test/httpd_basic_SUITE_data/printenv.bat new file mode 120000 index 0000000000..1bc8e52059 --- /dev/null +++ b/lib/inets/test/httpd_basic_SUITE_data/printenv.bat @@ -0,0 +1 @@ +../httpd_SUITE_data/server_root/cgi-bin/printenv.bat \ No newline at end of file diff --git a/lib/inets/test/httpd_basic_SUITE_data/printenv.sh b/lib/inets/test/httpd_basic_SUITE_data/printenv.sh new file mode 120000 index 0000000000..0136a3fa23 --- /dev/null +++ b/lib/inets/test/httpd_basic_SUITE_data/printenv.sh @@ -0,0 +1 @@ +../httpd_SUITE_data/server_root/cgi-bin/printenv.sh \ No newline at end of file -- cgit v1.2.3 From 34a95a40294b9fd62c1bb0de6cd5286dba8f15f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Wei=C3=9Fl?= Date: Thu, 5 Sep 2013 09:26:55 +0200 Subject: Add test for httpd config option 'script_timeout' The option got ignored before 720721e. --- lib/inets/test/httpd_basic_SUITE_data/Makefile.src | 14 ++++++++++++ lib/inets/test/httpd_basic_SUITE_data/cgi_sleep.c | 26 ++++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 lib/inets/test/httpd_basic_SUITE_data/Makefile.src create mode 100644 lib/inets/test/httpd_basic_SUITE_data/cgi_sleep.c (limited to 'lib/inets/test/httpd_basic_SUITE_data') diff --git a/lib/inets/test/httpd_basic_SUITE_data/Makefile.src b/lib/inets/test/httpd_basic_SUITE_data/Makefile.src new file mode 100644 index 0000000000..9da2ed583f --- /dev/null +++ b/lib/inets/test/httpd_basic_SUITE_data/Makefile.src @@ -0,0 +1,14 @@ +CC = @CC@ +LD = @LD@ +CFLAGS = @CFLAGS@ -I@erl_include@ @DEFS@ +CROSSLDFLAGS = @CROSSLDFLAGS@ + +PROGS = cgi_sleep@exe@ + +all: $(PROGS) + +cgi_sleep@exe@: cgi_sleep@obj@ + $(LD) $(CROSSLDFLAGS) -o cgi_sleep cgi_sleep@obj@ @LIBS@ + +cgi_sleep@obj@: cgi_sleep.c + $(CC) -c -o cgi_sleep@obj@ $(CFLAGS) cgi_sleep.c diff --git a/lib/inets/test/httpd_basic_SUITE_data/cgi_sleep.c b/lib/inets/test/httpd_basic_SUITE_data/cgi_sleep.c new file mode 100644 index 0000000000..126bb23987 --- /dev/null +++ b/lib/inets/test/httpd_basic_SUITE_data/cgi_sleep.c @@ -0,0 +1,26 @@ +#include +#include + +#ifdef __WIN32__ +#include +#include +#include +#else +#include +#endif + +int main(void) +{ + unsigned int seconds = 10; + +#ifdef __WIN32__ + Sleep(seconds * 1000); + _setmode(_fileno(stdout), _O_BINARY); +#else + sleep(seconds); +#endif + + printf("Content-type: text/plain\r\n\r\n"); + printf("Slept for %u seconds.\r\n", seconds); + exit(EXIT_SUCCESS); +} -- cgit v1.2.3