Mercurial > hg > webserver / changeset

--- a/LICENSE	Tue Jan 01 14:02:25 2013 +0100
+++ b/LICENSE	Tue Jan 01 19:22:56 2013 +0100
@@ -1,4 +1,4 @@
-Copyright 2011 Olaf Wintermann. All rights reserved.
+Copyright 2013 Olaf Wintermann. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

--- a/configure	Tue Jan 01 14:02:25 2013 +0100
+++ b/configure	Tue Jan 01 19:22:56 2013 +0100
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 #
-# Copyright 2011 Olaf Wintermann. All rights reserved.
+# Copyright 2013 Olaf Wintermann. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

--- a/doc/development/NSPR Dependencies.txt	Tue Jan 01 14:02:25 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-PR_Unlock
-PR_NewLock
-PR_SetFDCacheSize
-PR_Init
-PR_Lock
-PR_GetCurrentThread
-PR_Initialized
-PR_GetThreadPrivate
-PR_SetThreadPrivate
-PR_NewThreadPrivateIndex
-PR_AtomicIncrement
-
-

--- a/make/gcc.mk	Tue Jan 01 14:02:25 2013 +0100
+++ b/make/gcc.mk	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 #
-# Copyright 2012 Olaf Wintermann. All rights reserved.
+# Copyright 2013 Olaf Wintermann. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

--- a/make/install.mk	Tue Jan 01 14:02:25 2013 +0100
+++ b/make/install.mk	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 #
-# Copyright 2012 Olaf Wintermann. All rights reserved.
+# Copyright 2013 Olaf Wintermann. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

--- a/make/linux.mk	Tue Jan 01 14:02:25 2013 +0100
+++ b/make/linux.mk	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 #
-# Copyright 2012 Olaf Wintermann. All rights reserved.
+# Copyright 2013 Olaf Wintermann. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

--- a/make/solaris.mk	Tue Jan 01 14:02:25 2013 +0100
+++ b/make/solaris.mk	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 #
-# Copyright 2012 Olaf Wintermann. All rights reserved.
+# Copyright 2013 Olaf Wintermann. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -29,7 +29,7 @@
 
 # compiler and linker flags
 
-LDFLAGS = -lsocket -lsendfile
+LDFLAGS = -lsocket -lsendfile -lposix4
 
 
 # platform dependend source files

--- a/make/suncc.mk	Tue Jan 01 14:02:25 2013 +0100
+++ b/make/suncc.mk	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 #
-# Copyright 2012 Olaf Wintermann. All rights reserved.
+# Copyright 2013 Olaf Wintermann. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,7 +26,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-CFLAGS = -xc99
+CFLAGS = -xc99 -D_REENTRANT
 
 CC  = cc
 CXX = CC

--- a/src/Makefile	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/Makefile	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 #
-# Copyright 2011 Olaf Wintermann. All rights reserved.
+# Copyright 2013 Olaf Wintermann. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

--- a/src/server/Makefile	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/Makefile	Tue Jan 01 19:22:56 2013 +0100
@@ -67,7 +67,7 @@
 	mkdir -p $@
 
 $(MAIN_TARGET): $(MAINOBJS)
-	$(CXX) -o $(MAIN_TARGET) $(LDFLAGS) $(MAINOBJS)
+	$(CXX) -o $(MAIN_TARGET) $(MAINOBJS) $(LDFLAGS)
 
 
 ../../build/server/ucx/%.o: %.c

--- a/src/server/admin/Makefile	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/admin/Makefile	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 #
-# Copyright 2011 Olaf Wintermann. All rights reserved.
+# Copyright 2013 Olaf Wintermann. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

--- a/src/server/admin/admindex.c	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/admin/admindex.c	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/admin/objs.mk	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/admin/objs.mk	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 #
-# Copyright 2011 Olaf Wintermann. All rights reserved.
+# Copyright 2013 Olaf Wintermann. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

--- a/src/server/admin/template.h	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/admin/template.h	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/config/Makefile	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/config/Makefile	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 #
-# Copyright 2011 Olaf Wintermann. All rights reserved.
+# Copyright 2013 Olaf Wintermann. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

--- a/src/server/config/conf.c	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/config/conf.c	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/config/conf.h	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/config/conf.h	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/config/initconf.c	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/config/initconf.c	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/config/initconf.h	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/config/initconf.h	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/config/mimeconf.c	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/config/mimeconf.c	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2012 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/config/mimeconf.h	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/config/mimeconf.h	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2012 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/config/objconf.c	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/config/objconf.c	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/config/objconf.h	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/config/objconf.h	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/config/objs.mk	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/config/objs.mk	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 #
-# Copyright 2011 Olaf Wintermann. All rights reserved.
+# Copyright 2013 Olaf Wintermann. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

--- a/src/server/config/serverconf.c	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/config/serverconf.c	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/config/serverconf.h	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/config/serverconf.h	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/daemon/Makefile	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/daemon/Makefile	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 #
-# Copyright 2011 Olaf Wintermann. All rights reserved.
+# Copyright 2013 Olaf Wintermann. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

--- a/src/server/daemon/authdb.c	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/daemon/authdb.c	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/daemon/authdb.h	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/daemon/authdb.h	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/daemon/config.c	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/daemon/config.c	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/daemon/config.h	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/daemon/config.h	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/daemon/configmanager.c	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/daemon/configmanager.c	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/daemon/configmanager.h	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/daemon/configmanager.h	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/server/daemon/error.c	Tue Jan 01 19:22:56 2013 +0100
@@ -0,0 +1,69 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *
+ *   2. Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "error.h"
+
+#include "../ucx/string.h"
+#include "../util/pblock.h"
+
+// macro for creating an error string (ucx sstr_t)
+#define ERRMSG(s) { s, sizeof(s)-1 }
+
+static sstr_t error_403 = ERRMSG("<html><body>forbidden</body></html>");
+static sstr_t error_404 = ERRMSG("<html><body>not found</body></html>");
+static sstr_t error_500 = ERRMSG("<html><body>server error</body></html>");
+
+static sstr_t error_std = ERRMSG("<html><body>error</body></html>");
+
+int nsapi_error_request(Session *sn, Request *rq) {
+    short status = rq->status_num;
+    sstr_t msg = error_std;
+    switch(status) {
+        case 403: {
+            msg = error_403;
+            break;
+        }
+        case 404: {
+            msg = error_404;
+            break;
+        }
+        case 500: {
+            msg = error_500;
+            break;
+        }
+    }
+    
+    pblock_kninsert(pb_key_content_length, msg.length, rq->srvhdrs);
+    pblock_removekey(pb_key_content_type, rq->srvhdrs);
+    pblock_nvinsert("content-type", "text/html", rq->srvhdrs);
+    http_start_response(sn, rq);
+    
+    net_write(sn->csd, msg.ptr, msg.length);
+    
+    return REQ_PROCEED;
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/server/daemon/error.h	Tue Jan 01 19:22:56 2013 +0100
@@ -0,0 +1,46 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *
+ *   2. Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef ERROR_H
+#define	ERROR_H
+
+#include "../public/nsapi.h"
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+int nsapi_error_request(Session *sn, Request *rq);
+
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif	/* ERROR_H */
+

--- a/src/server/daemon/event.c	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/daemon/event.c	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/daemon/event.h	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/daemon/event.h	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/daemon/event_linux.c	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/daemon/event_linux.c	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/daemon/event_linux.h	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/daemon/event_linux.h	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/daemon/event_solaris.c	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/daemon/event_solaris.c	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/daemon/event_solaris.h	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/daemon/event_solaris.h	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/daemon/func.c	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/daemon/func.c	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/daemon/func.h	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/daemon/func.h	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/daemon/httplistener.c	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/daemon/httplistener.c	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/daemon/httplistener.h	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/daemon/httplistener.h	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/daemon/httpparser.c	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/daemon/httpparser.c	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/daemon/httpparser.h	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/daemon/httpparser.h	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/daemon/httprequest.c	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/daemon/httprequest.c	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -40,6 +40,7 @@
 #include "config.h"
 #include "vserver.h"
 #include "httplistener.h"
+#include "error.h"
 
 HTTPRequest *http_request_new() {
     HTTPRequest *req = malloc(sizeof(HTTPRequest));
@@ -357,7 +358,9 @@
         }
         
         if(r == REQ_ABORTED) {
-            nsapi_error_request(sn, rq);
+            // if an error occurred, we send an error page
+            nsapi_error_request((Session*)sn, (Request*)rq);
+            break;
         }
         
     } while (r == REQ_RESTART);
@@ -376,12 +379,6 @@
     return 0;
 }
 
-int nsapi_error_request(NSAPISession *sn, NSAPIRequest *rq) {
-    // TODO
-    
-    return REQ_PROCEED;
-}
-
 int nsapi_authtrans(NSAPISession *sn, NSAPIRequest *rq) {
     HTTPObjectConfig *objconf = rq->vs->objects;
     httpd_object *obj = objconf->objects[0];

--- a/src/server/daemon/httprequest.h	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/daemon/httprequest.h	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -85,7 +85,6 @@
 
 int nsapi_handle_request(NSAPISession *sn, NSAPIRequest *rq);
 int nsapi_finish_request(NSAPISession *sn, NSAPIRequest *rq);
-int nsapi_error_request(NSAPISession *sn, NSAPIRequest *rq);
 
 int nsapi_authtrans(NSAPISession *sn, NSAPIRequest *rq);
 int nsapi_nametrans(NSAPISession *sn, NSAPIRequest *rq);

--- a/src/server/daemon/ldap_auth.c	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/daemon/ldap_auth.c	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/daemon/ldap_auth.h	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/daemon/ldap_auth.h	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/daemon/log.c	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/daemon/log.c	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/daemon/log.h	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/daemon/log.h	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/daemon/main.c	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/daemon/main.c	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/daemon/objs.mk	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/daemon/objs.mk	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 #
-# Copyright 2011 Olaf Wintermann. All rights reserved.
+# Copyright 2013 Olaf Wintermann. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -49,6 +49,7 @@
 DAEMONOBJ += threadpools.o
 DAEMONOBJ += authdb.o
 DAEMONOBJ += ldap_auth.o
+DAEMONOBJ += error.o
 
 # add additional platform dependend objects
 # defined in generated config.mk

--- a/src/server/daemon/protocol.c	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/daemon/protocol.c	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/daemon/protocol.h	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/daemon/protocol.h	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/daemon/request.c	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/daemon/request.c	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/daemon/request.h	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/daemon/request.h	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/daemon/session.c	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/daemon/session.c	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/daemon/session.h	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/daemon/session.h	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/daemon/sessionhandler.c	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/daemon/sessionhandler.c	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/daemon/sessionhandler.h	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/daemon/sessionhandler.h	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/daemon/threadpools.c	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/daemon/threadpools.c	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/daemon/threadpools.h	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/daemon/threadpools.h	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/daemon/vserver.c	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/daemon/vserver.c	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/daemon/vserver.h	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/daemon/vserver.h	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/daemon/webserver.c	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/daemon/webserver.c	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/daemon/webserver.h	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/daemon/webserver.h	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/daemon/ws-fn.c	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/daemon/ws-fn.c	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/safs/auth.h	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/safs/auth.h	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/safs/common.c	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/safs/common.c	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/safs/common.h	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/safs/common.h	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/safs/init.c	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/safs/init.c	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/safs/init.h	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/safs/init.h	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/safs/nametrans.c	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/safs/nametrans.c	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/safs/nametrans.h	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/safs/nametrans.h	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/safs/objecttype.c	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/safs/objecttype.c	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/safs/objecttype.h	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/safs/objecttype.h	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/safs/objs.mk	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/safs/objs.mk	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 #
-# Copyright 2011 Olaf Wintermann. All rights reserved.
+# Copyright 2013 Olaf Wintermann. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

--- a/src/server/safs/pathcheck.c	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/safs/pathcheck.c	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/safs/pathcheck.h	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/safs/pathcheck.h	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/safs/service.c	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/safs/service.c	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -27,7 +27,6 @@
  */
 
 #include <stdio.h>
-#include <errno.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 
@@ -39,6 +38,8 @@
 #include <sys/sendfile.h>
 #include "../util/strbuf.h"
 
+#include <errno.h>
+
 // TODO: system sendfile Abstraktionen in neue Datei auslagern
 /*
 ssize_t sys_sendfile(int out_fd, int in_fd, off_t *off, size_t len) {
@@ -53,7 +54,7 @@
  *
  * adds content-length header and starts the response
  *
- * return the file descriptor or an error code
+ * return the file descriptor or -1
  */
 int prepare_service_file(Session *sn, Request *rq) {
     char *ppath = pblock_findkeyval(pb_key_ppath, rq->vars);
@@ -64,7 +65,8 @@
         perror("prepare_service_file: open");
 
         int status = 500;
-        switch(errno) {
+        int en = errno;
+        switch(en) {
             case EACCES: {
                 status = 403;
                 break;
@@ -103,9 +105,9 @@
 int send_file(pblock *pb, Session *sn, Request *rq) {
     int fd = prepare_service_file(sn, rq);
     if(fd < 0) {
-        /* TODO: service error */
-        http_start_response(sn, rq);
-        return REQ_PROCEED;
+        // if an error occurs, prepare_service_file sets the http status code
+        // we can just return REQ_ABORTED
+        return REQ_ABORTED;
     }
 
     /* send file*/

--- a/src/server/safs/service.h	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/safs/service.h	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/util/Makefile	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/util/Makefile	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 #
-# Copyright 2011 Olaf Wintermann. All rights reserved.
+# Copyright 2013 Olaf Wintermann. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

--- a/src/server/util/atomic.h	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/util/atomic.h	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/util/date.c	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/util/date.c	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/util/date.h	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/util/date.h	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/util/io.c	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/util/io.c	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/util/io.h	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/util/io.h	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/util/object.c	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/util/object.c	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/util/object.h	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/util/object.h	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/util/objs.mk	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/util/objs.mk	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 #
-# Copyright 2011 Olaf Wintermann. All rights reserved.
+# Copyright 2013 Olaf Wintermann. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

--- a/src/server/util/strbuf.c	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/util/strbuf.c	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/util/strbuf.h	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/util/strbuf.h	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/util/thrpool.c	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/util/thrpool.c	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/util/thrpool.h	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/util/thrpool.h	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/webdav/Makefile	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/webdav/Makefile	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 #
-# Copyright 2011 Olaf Wintermann. All rights reserved.
+# Copyright 2013 Olaf Wintermann. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

--- a/src/server/webdav/davparser.cpp	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/webdav/davparser.cpp	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/webdav/davparser.h	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/webdav/davparser.h	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/webdav/objs.mk	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/webdav/objs.mk	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 #
-# Copyright 2011 Olaf Wintermann. All rights reserved.
+# Copyright 2013 Olaf Wintermann. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

--- a/src/server/webdav/saxhandler.cpp	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/webdav/saxhandler.cpp	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/webdav/saxhandler.h	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/webdav/saxhandler.h	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/webdav/webdav.c	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/webdav/webdav.c	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

--- a/src/server/webdav/webdav.h	Tue Jan 01 14:02:25 2013 +0100
+++ b/src/server/webdav/webdav.h	Tue Jan 01 19:22:56 2013 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
+ * Copyright 2013 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met: