[netty-3.9] 15/18: Merge tag 'upstream/3.9.7.Final'

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository netty-3.9.

commit 0d0485be08e47419116f10547c7d702ae6700bdd
Merge: 719bec0 ffc6193
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jan 10 01:29:52 2017 +0100

    Merge tag 'upstream/3.9.7.Final'
    
    Upstream version 3.9.7.Final

 pom.xml                                            |   2 +-
 .../http/upload/HttpUploadServerHandler.java       |  20 +-
 .../org/jboss/netty/handler/codec/http/Cookie.java | 178 +++++++++----
 .../netty/handler/codec/http/CookieDecoder.java    | 113 +++++++--
 .../netty/handler/codec/http/CookieEncoder.java    | 190 ++------------
 .../jboss/netty/handler/codec/http/CookieUtil.java | 104 ++++++++
 .../netty/handler/codec/http/DefaultCookie.java    | 255 ++++---------------
 .../handler/codec/http/HttpHeaderDateFormat.java   |   2 +-
 .../netty/handler/codec/http/HttpRequest.java      |  18 +-
 .../netty/handler/codec/http/HttpResponse.java     |  17 +-
 .../codec/http/cookie/ClientCookieDecoder.java     | 262 +++++++++++++++++++
 .../codec/http/cookie/ClientCookieEncoder.java     | 148 +++++++++++
 .../netty/handler/codec/http/cookie/Cookie.java    | 141 +++++++++++
 .../handler/codec/http/cookie/CookieDecoder.java   |  86 +++++++
 .../handler/codec/http/cookie/CookieEncoder.java   |  51 ++++
 .../codec/http/{ => cookie}/CookieHeaderNames.java |  28 +--
 .../handler/codec/http/cookie/CookieUtil.java      | 153 +++++++++++
 .../codec/http/{ => cookie}/DefaultCookie.java     | 198 +++++----------
 .../codec/http/cookie/ServerCookieDecoder.java     | 158 ++++++++++++
 .../codec/http/cookie/ServerCookieEncoder.java     | 190 ++++++++++++++
 .../package-info.java}                             |  27 +-
 .../org/jboss/netty/handler/ssl/SslHandler.java    |  29 ++-
 .../handler/codec/http/CookieDecoderTest.java      |  14 +-
 .../handler/codec/http/CookieEncoderTest.java      |  77 +++---
 .../codec/http/cookie/ClientCookieDecoderTest.java | 280 +++++++++++++++++++++
 .../codec/http/cookie/ClientCookieEncoderTest.java |  52 ++++
 .../codec/http/cookie/ServerCookieDecoderTest.java | 185 ++++++++++++++
 .../codec/http/cookie/ServerCookieEncoderTest.java |  63 +++++
 28 files changed, 2325 insertions(+), 716 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/netty-3.9.git