break-fnord.sh work with busybox expr

fix punctuation and typo; fixes #1

CHANGES

@@ -1,3 +1,8 @@
+	fix punctuation and typo
+
+4.4:
+	Also log when called from stunnel
+
 4.3.1:
 	Add .webm mime type
 
@@ -152,7 +157,7 @@
 	Olaf: I changed my initial CGI-interface to NOT use the filesystem but
 		two pipes.
 	Add whole-host redirect (see README)
-	Olaf: added direcory-lists and "index.cgi" support (normal CGI only !
+	Olaf: added directory-lists and "index.cgi" support (normal CGI only !
 		"nph-index.cgi" is not supported). Fixed some problematic parts in the
 		CGI-interface (\n -> \r\n converter for http-header and CGI crash
 		handling)

Dockerfile

@@ -0,0 +1,21 @@
+FROM alpine
+
+RUN apk --no-cache add s6-networking
+
+RUN apk --no-cache add build-base
+COPY . /usr/local/src/eris
+RUN make -C /usr/local/src/eris
+RUN cp /usr/local/src/eris/eris /usr/bin
+RUN rm -rf /usr/local/src/eris
+RUN apk --no-cache del build-base
+
+RUN addgroup -S -g 800 www
+RUN adduser -S -u 800 -G www www
+
+RUN mkdir /www
+WORKDIR /www
+
+EXPOSE 80
+
+CMD ["s6-tcpserver", "-u", "80", "-g", "80", "0.0.0.0", "80", "/usr/bin/eris", "-."]
+

HTTPS.md

@@ -2,7 +2,7 @@ SSL with eris
 =============
 
 Eris does not care what transport is in use: that job is left to the invoking
-program (eg. tcpserver).
+program (e.g. tcpserver).
 
 In the past you could use `sslio` with `tcpsvd`,
 but `sslio` has not been updated in a long time,

README.md

@@ -96,7 +96,7 @@ Please see <http://hoohoo.ncsa.uiuc.edu/cgi/interface.html> for the CGI specific
 About The Name
 ==============
 
-[Eris](http://en.wikipedia.org/wiki/Eris_(dwarf_planet%29)
+[Eris](http://en.wikipedia.org/wiki/Eris_%28dwarf_planet%29)
 is the most massive (heaviest) dwarf planet in the solar system.
 It's heavier than Pluto!
 

break-fnord.sh

@@ -1,9 +1,9 @@
 #! /bin/sh
 
-## Breaking fnord 1.10
+## Breaking fnord 1.11
 
 if [ "$1" = "clean" ]; then
-    rm -rf fnord-1.10
+    rm -rf fnord-1.11
 fi
 
 # Set HTTPD= to test something else
@@ -14,6 +14,7 @@ case ${HTTPD:=./fnord} in
         ;;
 esac
 
+tests=0
 title() {
     printf "%-50s: " "$1"
     tests=$(expr $tests + 1)
@@ -36,16 +37,16 @@ d () {
 }
 
 
-if [ ! -f fnord-1.10.tar.bz2 ]; then
-    wget http://www.fefe.de/fnord/fnord-1.10.tar.bz2
+if [ ! -f fnord-1.11.tar.bz2 ]; then
+    wget http://www.fefe.de/fnord/fnord-1.11.tar.bz2
 fi
 
-if [ ! -f fnord-1.10/httpd.c ]; then
-    rm -rf fnord-1.10
-    bzcat fnord-1.10.tar.bz2 | tar xf -
+if [ ! -f fnord-1.11/httpd.c ]; then
+    rm -rf fnord-1.11
+    bzcat fnord-1.11.tar.bz2 | tar xf -
 fi
 
-cd fnord-1.10
+cd fnord-1.11
 
 # Comment this out if you want to build with diet libc
 make DIET=

contrib/README

@@ -5,5 +5,5 @@ a little easier.
 Quite a lot of web software these days is written to work with
 Apache and nothing else.  PHP is a notable example: even PHP-CGI,
 as shipped on Debian, requires special environment variables that
-only Apache sets, and doesn't work with eg. mathopd, boa, busybox
+only Apache sets, and doesn't work with, e.g. mathopd, boa, busybox
 httpd, or eris.

test.sh

@@ -4,6 +4,10 @@
 : ${HTTPD_CGI:=./eris -c}
 : ${HTTPD_IDX:=./eris -d}
 
+tests=0
+successes=0
+failures=0
+
 H () {
     section="$*"
     printf "\n%-20s " "$*"
@@ -138,6 +142,10 @@ title "Logging busybox"
 (printf 'GET /index.html HTTP/1.1\r\nHost: host\r\n\r\n' | 
     PROTO=TCP TCPREMOTEADDR=[::1]:8765 $HTTPD >/dev/null) 2>&1 | grep -Fxq '[::1]:8765 200 6 host (null) (null) /index.html' && pass || fail
 
+title "Logging stunnel"
+(printf 'GET /index.html HTTP/1.1\r\nHost: host\r\n\r\n' | 
+    REMOTE_HOST=::1 REMOTE_PORT=8765 $HTTPD >/dev/null) 2>&1 | grep -Fxq '::1:8765 200 6 host (null) (null) /index.html' && pass || fail
+
 
 
 H "Options"

timerfc.c

@@ -40,9 +40,6 @@
 #include <string.h>
 #include "timerfc.h"
 
-static const char days[] = "SunMonTueWedThuFriSat";
-static const char months[] = "JanFebMarAprMayJunJulAugSepOctNovDec";
-
 time_t
 timerfc(const char *s)
 {