[Pkg-ocaml-maint-commits] [ocsigenserver] 04/11: Merge tag 'upstream/2.6'

[Mehdi Dogguy]

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

mehdi pushed a commit to branch master
in repository ocsigenserver.

commit af393805ba694df2946bb7c2069880e84d625b10
Merge: b22a50a b9b7374
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Sun Oct 18 11:00:23 2015 +0200

    Merge tag 'upstream/2.6'
    
    Upstream version 2.6

 .gitignore                                       |   2 +
 .jenkins.sh                                      |   1 -
 .merlin                                          |  15 +
 CHANGES                                          |  17 +-
 Makefile                                         |   8 -
 Makefile.options                                 |  16 +-
 README => README.md                              | 124 +++--
 VERSION                                          |   2 +-
 configure                                        |  16 +-
 doc/Makefile                                     |   2 +-
 opam                                             |  17 +-
 predist                                          |   5 -
 src/Makefile                                     |   3 +-
 src/Makefile.filelist                            |   1 +
 src/baselib/.depend                              |  73 ++-
 src/baselib/Makefile                             |  20 +-
 src/baselib/ocsigen_config.ml.in                 |   6 +-
 src/baselib/ocsigen_lib.ml                       |  10 +-
 src/baselib/ocsigen_lib.mli                      |  12 +
 src/baselib/ocsigen_lib_base.ml                  |  23 +-
 src/baselib/ocsigen_lib_base.mli                 |  29 +-
 src/baselib/ocsigen_loader.ml                    |  24 +-
 src/baselib/ocsigen_messages.ml                  |  98 +---
 src/baselib/ocsigen_messages.mli                 |  26 -
 src/baselib/ocsigen_stream.ml                    |  30 +-
 src/baselib/ocsigen_stream.mli                   |  10 +-
 src/baselib/polytables.ml                        |   2 +-
 src/baselib/polytables.mli                       |   2 +-
 src/extensions/.depend                           | 140 ++---
 src/extensions/Makefile                          |  19 +-
 src/extensions/accesscontrol.ml                  | 590 ++++++++++----------
 src/extensions/accesscontrol.mli                 |   2 +-
 src/extensions/authbasic.ml                      | 152 ++---
 src/extensions/cgimod.ml                         |  29 +-
 src/extensions/cors.ml                           |  86 +--
 src/extensions/deflatemod.ml                     | 184 ++++---
 src/extensions/extendconfiguration.ml            |   2 +-
 src/extensions/ocsigen_comet.ml                  | 133 ++---
 src/extensions/ocsipersist-dbm/.depend           |  12 +-
 src/extensions/ocsipersist-dbm/Makefile          |   2 +-
 src/extensions/ocsipersist-dbm/ocsidbm.ml        |   2 +-
 src/extensions/ocsipersist-dbm/ocsipersist.ml    | 103 ++--
 src/extensions/ocsipersist-sqlite/.depend        |   6 +-
 src/extensions/ocsipersist-sqlite/ocsipersist.ml |   7 +-
 src/extensions/outputfilter.ml                   | 111 ++--
 src/extensions/redirectmod.ml                    | 114 ++--
 src/extensions/revproxy.ml                       | 168 +++---
 src/extensions/rewritemod.ml                     |  11 +-
 src/extensions/staticmod.ml                      | 205 +++----
 src/extensions/userconf.ml                       | 163 +++---
 src/http/.depend                                 | 106 ++--
 src/http/Makefile                                |  13 +-
 src/http/http_headers.ml                         |   2 +-
 src/http/http_headers.mli                        |   2 +-
 src/http/ocsigen_charset_mime.ml                 |  24 +-
 src/http/ocsigen_http_com.ml                     | 101 ++--
 src/http/ocsigen_http_com.mli                    |   2 +-
 src/http/ocsigen_http_frame.ml                   | 168 +++---
 src/http/ocsigen_http_frame.mli                  |  23 +-
 src/http/ocsigen_senders.ml                      |  92 ++--
 src/server/.depend                               | 121 ++--
 src/server/Makefile                              |  12 +-
 src/server/ocsigen_command.ml                    |  45 ++
 src/server/ocsigen_command.mli                   |  41 ++
 src/server/ocsigen_common_server.mli             |  33 ++
 src/server/ocsigen_extensions.ml                 | 407 ++++++--------
 src/server/ocsigen_extensions.mli                |  39 +-
 src/server/ocsigen_http_client.ml                | 308 +++++------
 src/server/ocsigen_local_files.ml                |  65 +--
 src/server/ocsigen_parseconfig.ml                | 670 +++++++++++------------
 src/server/ocsigen_parseconfig.mli               |  20 +-
 src/server/ocsigen_range.mli                     |   8 +-
 src/server/ocsigen_request_info.ml               |  26 +
 src/server/ocsigen_request_info.mli              |  10 +
 src/server/ocsigen_server.ml                     | 602 ++++++++++----------
 src/server/ocsigen_socket.ml                     |  66 +++
 src/server/ocsigen_socket.mli                    |  28 +
 77 files changed, 3096 insertions(+), 2773 deletions(-)

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