Cohttp revived

.gitignore

@@ -12,17 +12,15 @@
 *~
 Makefile.config
 src/baselib/dynlink_wrapper.ml
-src/baselib/ocsigen_config.ml
-src/http/http_lexer.ml
-src/http/http_parser.ml
-src/http/http_parser.mli
+src/baselib/ocsigen_config_static.ml
 src/server/ocsigenserver
 src/server/ocsigenserver.opt
 src/extensions/ocsipersist.mli
 src/extensions/ocsipersist-dbm/ocsidbm
 src/extensions/ocsipersist-dbm/ocsidbm.opt
 src/extensions/ocsipersist-dbm/ocsipersist.mli
 src/extensions/ocsipersist-sqlite/ocsipersist.mli
+src/extensions/ocsipersist-pgsql/ocsipersist.mli
 src/files/META
 src/files/META.ocsigenserver
 src/extensions/files/META

.jenkins.sh

@@ -1,5 +1,6 @@
 opam pin add --no-action ocsigenserver .
 opam install camlzip
+opam pin add tyxml --dev-repo
 opam install --deps-only ocsigenserver
 opam install --verbose ocsigenserver
 

.merlin

@@ -1,4 +1,5 @@
-PKG lwt lwt.ssl
+PKG lwt
+PKG lwt_ssl
 PKG findlib
 PKG react
 PKG pcre
@@ -7,9 +8,9 @@ PKG cryptokit
 PKG netstring
 PKG netstring-pcre
 PKG ipaddr
-PKG tyxml tyxml.parser
 PKG camlzip
 PKG dynlink
+PKG cohttp conduit.lwt-unix
 
 S src/**
 B src/**

.travis.yml

@@ -0,0 +1,11 @@
+language: c
+sudo: required
+install: wget https://raw.githubusercontent.com/ocaml/ocaml-ci-scripts/master/.travis-opam.sh
+script: bash -ex .travis-opam.sh
+env:
+  - OCAML_VERSION=4.03 PACKAGE=ocsigenserver
+  - OCAML_VERSION=4.05 PACKAGE=ocsigenserver
+  - OCAML_VERSION=4.06 PACKAGE=ocsigenserver
+os:
+  - linux
+  - osx

Makefile.options

@@ -22,29 +22,29 @@ ifeq "$(PREEMPTIVE)" "YES"
 endif
 
 ## ${SERVER_PACKAGE} is not only used to build the 'ocsigenserver' executable
-## but also to generate src/baselib/ocsigen_config.ml and src/files/META
+## but also to generate src/baselib/ocsigen_config_static.ml and src/files/META
 
 ifeq "$(PREEMPTIVE)" "YES"
 LWT_PREEMPTIVE_PACKAGE:=lwt.preemptive
 endif
 
 BASE_PACKAGE := lwt ipaddr bytes
 
-SERVER_PACKAGE := lwt.ssl           \
+SERVER_PACKAGE := lwt_ssl           \
 		  bytes			\
 	          ${LWT_PREEMPTIVE_PACKAGE} \
                   ipaddr            \
-	          netstring         \
-	          netstring-pcre    \
                   findlib           \
 	          cryptokit         \
-		  tyxml             \
-	          tyxml.parser      \
+                  pcre              \
+                  str               \
+                  xml-light         \
                   dynlink           \
+                  cohttp.lwt        \
+                  hmap
 
 INITPACKAGE := \"$(shell ${OCAMLFIND} query -p-format -recursive        \
 	                            -separator '\";\"' ${SERVER_PACKAGE})\"; \
-	       \"${PROJECTNAME}.commandline\";  \
                \"${PROJECTNAME}.polytables\";   \
                \"${PROJECTNAME}.cookies\";      \
                \"${PROJECTNAME}.baselib\";      \

configure

@@ -405,30 +405,24 @@ check_ocamlversion
 
 check_binary ocamlfind "See: http://projects.camlcity.org/projects/findlib.html"
 
+check_library cohttp "See: https://github.com/mirage/ocaml-cohttp"
+check_library cohttp.lwt "Missing support for 'lwt' in cohttp."
 check_library react "See: http://erratique.ch/software/react"
 check_library ssl "See: http://sourceforge.net/projects/savonet/files/ocaml-ssl"
 
 check_library lwt "See: http://ocsigen.org/lwt"
 check_library lwt.unix  "Missing support for 'unix' in lwt."
-check_library lwt.react "Missing support for 'react' in lwt."
-check_library lwt.ssl   "Missing support for 'ssl' in lwt."
+check_library lwt_ssl   "See: http://ocsigen.org/lwt"
 check_library lwt.preemptive "Missing support for 'preemptive' in lwt."
 
-check_library netstring \
-    "See ocamlnet: http://projects.camlcity.org/projects/ocamlnet.html"
-check_library netstring-pcre \
-    "See ocamlnet: http://projects.camlcity.org/projects/ocamlnet.html"
-check_library netsys \
-    "See ocamlnet: http://projects.camlcity.org/projects/ocamlnet.html"
-
 check_library pcre "See: http://ocaml.info/home/ocaml_sources.html"
 check_library cryptokit "See: http://pauillac.inria.fr/~xleroy/software.html#cryptokit"
 
-check_library tyxml "See: http://ocsigen.org/tyxml/"
+check_library xml-light "See: https://github.com/ncannasse/xml-light"
 
 # Check PostgreSQL
 case "$with_pgsql" in
- 1) if test_library pgocaml; then with_pgsql=1; else with_pgsql=0; fi;;
+ 1) if test_library pgocaml && test_library pgocaml.syntax; then with_pgsql=1; else with_pgsql=0; fi;;
  2) check_library pgocaml "https://github.com/darioteixeira/pgocaml";;
 esac
 
@@ -668,4 +662,3 @@ echo
 echo "   make install"
 echo "   make install.doc"
 echo
-

doc/Makefile

@@ -4,7 +4,7 @@ include ../src/Makefile.filelist
 OCAMLDOC := ${OCAMLFIND} ocamldoc
 ODOC_WIKI := odoc_wiki.cma
 
-LIBS := -package lwt,tyxml,ssl,netstring,netstring-pcre,ipaddr \
+LIBS := -package lwt,ssl,ipaddr,cohttp.lwt,pcre,xml-light \
         ${addprefix -I ../src/, baselib http server extensions }
 
 doc: api-html/index.html
@@ -29,4 +29,3 @@ uninstall:
 clean:
 	-rm -f api-html/* api-wiki/*
 	-rm -f *~ \#* .\#*
-

doc/indexdoc

@@ -16,10 +16,6 @@ Ocsigen_config
 Ocsigen_extensions
 Ocsigen_local_files
 Ocsigen_headers
-Ocsigen_senders
-Ocsigen_http_frame
-Ocsigen_http_client
-Ocsigen_http_com
 Ocsigen_stream
 Ocsigen_comet
 Authbasic

doc/manual-wiki/launching.wiki

@@ -25,16 +25,9 @@ following options:
   -v, --verbose
          Verbose mode.
 
-  -V ,  --veryverbose
-         Very verbose mode (debug).
-
   --version
          Show version of program.
 }}}
 
 One initialization script should be provided by your distribution for
 launching the server automatically each time you launch the computer.
-
-
-
-

opam

@@ -48,17 +48,19 @@ depends: [
   "base-threads"
   "react"
   "ssl"
-  "lwt" {>= "2.5.0" & < "3.0.0"}
-  "ocamlnet" {>= "4.0.2"}
+  "lwt" {>= "3.0.0"}
+  "lwt_ssl"
   "pcre"
   "cryptokit"
-  "tyxml" {>= "4.0.0"}
+  "xml-light"
   ("dbm" | "sqlite3" | "pgocaml")
   "ipaddr" {>= "2.1"}
-  "camlp4"
+  "cohttp-lwt-unix"
+  "hmap"
 ]
 depopts: "camlzip"
 conflicts: [
   "camlzip" {< "1.04"}
   "pgocaml" {< "2.2"}
 ]
+available: [ocaml-version >= "4.03.0"]

src/Makefile

@@ -37,7 +37,7 @@ files/META.${PROJECTNAME}: files/META.in ../Makefile.config ../Makefile.options
 	  | sed s/%%NAME%%/$(PROJECTNAME)/g \
 	  | sed s/%%DEPS%%/$(shell ${OCAMLFIND} query -p-format -separator ',' ${SERVER_PACKAGE})/g \
 	  | sed s/%%BASEDEPS%%/$(shell ${OCAMLFIND} query -p-format -separator ',' ${BASE_PACKAGE})/g \
-	  | sed "s%package \"\(polytables\|commandline\|baselib\)\" (%package \"\1\" (\n  directory = \"../baselib\"%" \
+	  | sed "s%package \"\(polytables\|baselib\)\" (%package \"\1\" (\n  directory = \"../baselib\"%" \
 	  | sed "s%package \"\(http\|cookies\)\" (%package \"\1\" (\n  directory = \"../http\"%" \
 	  | sed "s%directory = \"extensions\"%directory = \"../extensions\"%" \
 	  >> $@

src/Makefile.filelist

@@ -1,44 +1,39 @@
 BIN := server/${PROJECTNAME}
 NATBIN := server/${PROJECTNAME}.opt
 
-INTF_BASE := baselib/ocsigen_cache.cmi	   \
-	baselib/ocsigen_lib_base.cmi	   \
-	baselib/ocsigen_lib.cmi	   \
-	baselib/ocsigen_config.cmi	   \
-	baselib/ocsigen_messages.cmi       \
-	baselib/ocsigen_stream.cmi	   \
-	baselib/ocsigen_loader.cmi	   \
-        baselib/polytables.cmi	           \
+INTF_BASE := baselib/ocsigen_cache.cmi     \
+        baselib/ocsigen_lib_base.cmi       \
+        baselib/ocsigen_lib.cmi            \
+        baselib/ocsigen_stream.cmi         \
+        baselib/ocsigen_loader.cmi         \
+        baselib/polytables.cmi             \
         \
-	http/http_headers.cmi	           \
-	http/ocsigen_http_frame.cmi	   \
-	http/ocsigen_headers.cmi	   \
-	http/framepp.cmi		   \
-	http/ocsigen_http_com.cmi	   \
-	http/ocsigen_charset_mime.cmi      \
-	http/ocsigen_senders.cmi	   \
-        http/ocsigen_cookies.cmi           \
-	\
-	server/ocsigen_extensions.cmi      \
-	server/ocsigen_parseconfig.cmi     \
-	server/ocsigen_http_client.cmi     \
-	server/ocsigen_local_files.cmi     \
-	server/ocsigen_server.cmi	   \
-	server/ocsigen_request_info.cmi
-
-INTF := ${INTF_BASE} baselib/ocsigen_getcommandline.cmi
-
-IMPL := baselib/ocsigen_lib_base.cmo	   \
-        baselib/baselib.cma		   \
-	baselib/parsecommandline.cma       \
-	baselib/donotparsecommandline.cma  \
-        baselib/polytables.cmo	           \
-	\
-        http/ocsigen_cookies.cmo           \
-        http/http.cma	                   \
-	\
-	server/${PROJECTNAME}.cma          \
-	server/server_main.cmo             \
+        http/ocsigen_charset_mime.cmi      \
+        http/ocsigen_cookie_map.cmi        \
+        http/ocsigen_header.cmi            \
+        \
+        server/ocsigen_config.cmi          \
+        server/ocsigen_request.cmi         \
+        server/ocsigen_response.cmi        \
+        server/ocsigen_messages.cmi        \
+        server/ocsigen_multipart.cmi       \
+        server/ocsigen_extensions.cmi      \
+        server/ocsigen_parseconfig.cmi     \
+        server/ocsigen_local_files.cmi     \
+        server/ocsigen_server.cmi
+
+INTF := ${INTF_BASE}
+
+IMPL := baselib/ocsigen_lib_base.cmo       \
+        baselib/ocsigen_config_static.cmo  \
+        baselib/baselib.cma                \
+        baselib/polytables.cmo             \
+        \
+        http/ocsigen_cookie_map.cmo        \
+        http/http.cma                      \
+        \
+        server/${PROJECTNAME}.cma          \
+        server/server_main.cmo
 
 INTF_CMX := $(patsubst %.cmi,%.cmx,${INTF_BASE})
 
@@ -48,34 +43,25 @@ NATIMPL := $(patsubst %.cmo,%.cmx, $(filter %.cmo,${IMPL})) \
 	   $(patsubst %.cma,%.a,   $(filter %.cma,${IMPL})) \
 
 ifeq "$(NATDYNLINK)" "YES"
-NATIMPL += baselib/parsecommandline.cmxs      \
-           baselib/donotparsecommandline.cmxs \
-           baselib/polytables.cmxs
+NATIMPL += baselib/polytables.cmxs
 endif
 
 PLUGINS_BIN  :=
 
-PLUGINS_INTF := extensions/ocsigen_comet.cmi       \
-                extensions/accesscontrol.cmi       \
-                extensions/authbasic.cmi           \
-                extensions/ocsipersist.cmi         \
-
-PLUGINS_IMPL := extensions/staticmod.cmo           \
-                extensions/cgimod.cmo              \
-                extensions/redirectmod.cmo         \
-                extensions/revproxy.cmo            \
-                extensions/extensiontemplate.cmo   \
-                extensions/accesscontrol.cmo       \
-                extensions/userconf.cmo            \
-                extensions/outputfilter.cmo        \
-                extensions/authbasic.cmo           \
-                extensions/rewritemod.cmo          \
-                extensions/extendconfiguration.cmo \
-                extensions/ocsigen_comet.cmo       \
-                extensions/cors.cmo                \
+PLUGINS_INTF := extensions/accesscontrol.cmi extensions/authbasic.cmi	\
+                extensions/cors.cmi extensions/ocsipersist.cmi		\
+                extensions/outputfilter.cmi				\
+                extensions/redirectmod.cmi extensions/staticmod.cmi
+
+PLUGINS_IMPL := extensions/accesscontrol.cmo extensions/authbasic.cmo	\
+             extensions/cors.cmo extensions/extendconfiguration.cmo	\
+             extensions/outputfilter.cmo extensions/redirectmod.cmo	\
+             extensions/revproxy.cmo extensions/rewritemod.cmo		\
+             extensions/staticmod.cmo
 
 ifeq "$(CAMLZIP)" "YES"
 PLUGINS_IMPL += extensions/deflatemod.cmo
+PLUGINS_INTF += extensions/deflatemod.cmi
 endif
 
 ifeq "$(OCSIPERSISTSQLITE)" "YES"

src/baselib/.depend

@@ -1,10 +1,3 @@
-ocsigen_loader.cmi :
-ocsigen_cache.cmi :
-ocsigen_stream.cmi :
-ocsigen_config.cmi : ocsigen_lib.cmi
-ocsigen_messages.cmi :
-ocsigen_getcommandline.cmi :
-polytables.cmi :
 dynlink_wrapper.cmo :
 dynlink_wrapper.cmx :
 dynlink_wrapper.natdynlink.cmo :
@@ -13,23 +6,23 @@ dynlink_wrapper.nonatdynlink.cmo :
 dynlink_wrapper.nonatdynlink.cmx :
 ocsigen_cache.cmo : ocsigen_cache.cmi
 ocsigen_cache.cmx : ocsigen_cache.cmi
-ocsigen_commandline.cmo : ocsigen_getcommandline.cmi ocsigen_config.cmi
-ocsigen_commandline.cmx : ocsigen_getcommandline.cmi ocsigen_config.cmx
-ocsigen_config.cmo : ocsigen_lib.cmi ocsigen_config.cmi
-ocsigen_config.cmx : ocsigen_lib.cmx ocsigen_config.cmi
-ocsigen_lib_base.cmo : ocsigen_lib_base.cmi
-ocsigen_lib_base.cmx : ocsigen_lib_base.cmi
+ocsigen_cache.cmi :
+ocsigen_config_static.cmo : ocsigen_lib.cmi
+ocsigen_config_static.cmx : ocsigen_lib.cmx
 ocsigen_lib.cmo : ocsigen_lib_base.cmi ocsigen_lib.cmi
 ocsigen_lib.cmx : ocsigen_lib_base.cmx ocsigen_lib.cmi
-ocsigen_loader.cmo : ocsigen_lib.cmi ocsigen_config.cmi dynlink_wrapper.cmo \
-    ocsigen_loader.cmi
-ocsigen_loader.cmx : ocsigen_lib.cmx ocsigen_config.cmx dynlink_wrapper.cmx \
-    ocsigen_loader.cmi
-ocsigen_messages.cmo : ocsigen_config.cmi ocsigen_messages.cmi
-ocsigen_messages.cmx : ocsigen_config.cmx ocsigen_messages.cmi
-ocsigen_stream.cmo : ocsigen_lib.cmi ocsigen_config.cmi ocsigen_stream.cmi
-ocsigen_stream.cmx : ocsigen_lib.cmx ocsigen_config.cmx ocsigen_stream.cmi
+ocsigen_lib_base.cmo : ocsigen_lib_base.cmi
+ocsigen_lib_base.cmx : ocsigen_lib_base.cmi
+ocsigen_loader.cmo : ocsigen_lib.cmi ocsigen_config_static.cmo \
+    dynlink_wrapper.cmo ocsigen_loader.cmi
+ocsigen_loader.cmx : ocsigen_lib.cmx ocsigen_config_static.cmx \
+    dynlink_wrapper.cmx ocsigen_loader.cmi
+ocsigen_loader.cmi :
+ocsigen_stream.cmo : ocsigen_lib.cmi ocsigen_stream.cmi
+ocsigen_stream.cmx : ocsigen_lib.cmx ocsigen_stream.cmi
+ocsigen_stream.cmi :
 polytables.cmo : polytables.cmi
 polytables.cmx : polytables.cmi
-ocsigen_lib_base.cmi :
+polytables.cmi :
 ocsigen_lib.cmi : ocsigen_lib_base.cmi
+ocsigen_lib_base.cmi :