[Pkg-ocaml-maint-commits] [ocsigenserver] 02/05: Merge tag 'upstream/2.3.0'

[Stéphane Glondu]

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository ocsigenserver.

commit 1a5116a4f1e94b1249b4ec3333f5eddda2da6b4d
Merge: 91e6ec2 8026468
Author: Stephane Glondu <steph at glondu.net>
Date:   Mon Jun 2 07:37:24 2014 +0200

    Merge tag 'upstream/2.3.0'
    
    Upstream version 2.3.0

 .ocp-indent                                      |   3 +
 Makefile                                         |   4 +-
 Makefile.options                                 |   1 +
 README                                           |  18 ++--
 boring                                           |  30 ------
 configure                                        |   2 +
 doc/Makefile                                     |   2 +-
 doc/manual-wiki/accesscontrol.wiki               |   2 +-
 doc/manual-wiki/cgimod.wiki                      |  40 ++++----
 doc/manual-wiki/config.wiki                      |  18 +++-
 doc/manual-wiki/cors.wiki                        |   2 +-
 doc/manual-wiki/deflatemod.wiki                  |  20 ++--
 doc/manual-wiki/outputfilter.wiki                |   2 +-
 doc/manual-wiki/quickstart.wiki                  |   3 +-
 doc/manual-wiki/redirectmod.wiki                 |   2 +-
 doc/manual-wiki/rewritemod.wiki                  |   2 +-
 format.sh                                        |   6 ++
 opam/descr                                       |   6 ++
 opam/files/ocsigenserver.install                 |   4 +
 opam/opam                                        |  26 +++++
 opam/url                                         |   1 +
 predist                                          |   0
 src/Makefile                                     |   1 +
 src/baselib/Makefile                             |   2 +-
 src/baselib/ocsigen_cache.mli                    |  14 ++-
 src/baselib/ocsigen_config.ml.in                 |  13 ++-
 src/baselib/ocsigen_config.mli                   |   2 +
 src/baselib/ocsigen_lib.ml                       |   5 +-
 src/baselib/ocsigen_lib.mli                      |   2 +-
 src/baselib/ocsigen_lib_base.ml                  |   3 +
 src/baselib/ocsigen_lib_base.mli                 |  14 +--
 src/baselib/ocsigen_messages.ml                  |  64 ++++++++++--
 src/baselib/ocsigen_messages.mli                 |  15 ++-
 src/extensions/Makefile                          |   1 +
 src/extensions/extensiontemplate.ml              |   2 +-
 src/extensions/ocsigen_comet.ml                  |  38 ++++---
 src/extensions/ocsipersist-dbm/ocsipersist.ml    |  10 +-
 src/extensions/ocsipersist-sqlite/ocsipersist.ml |  10 +-
 src/extensions/ocsipersist.mli                   |   5 +
 src/extensions/redirectmod.ml                    |   2 +-
 src/extensions/rewritemod.ml                     |   2 +-
 src/files/META.in                                |  15 ++-
 src/files/mime.types                             |   5 +-
 src/http/Makefile                                |   2 +-
 src/http/ocsigen_charset_mime.ml                 |   2 +-
 src/http/ocsigen_headers.ml                      |  28 +++---
 src/http/ocsigen_headers.mli                     |   5 +-
 src/http/ocsigen_senders.ml                      |   6 +-
 src/server/ocsigen_extensions.ml                 |  43 ++++----
 src/server/ocsigen_extensions.mli                |  16 +--
 src/server/ocsigen_http_client.ml                |  55 +++++-----
 src/server/ocsigen_http_client.mli               |  15 ++-
 src/server/ocsigen_parseconfig.ml                | 123 ++++++++++++++++-------
 src/server/ocsigen_range.ml                      |  41 ++++----
 src/server/ocsigen_server.ml                     |  86 ++++++++--------
 55 files changed, 521 insertions(+), 320 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocsigenserver.git