Index: 3rdParty_sources/servlet-api/javax/servlet/http/HttpServletRequestWrapper.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r188531e2b734df509672788d897e1030e4b1a24a
--- 3rdParty_sources/servlet-api/javax/servlet/http/HttpServletRequestWrapper.java	(.../HttpServletRequestWrapper.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ 3rdParty_sources/servlet-api/javax/servlet/http/HttpServletRequestWrapper.java	(.../HttpServletRequestWrapper.java)	(revision 188531e2b734df509672788d897e1030e4b1a24a)
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 1997-2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -81,6 +81,8 @@
     /** 
      * Constructs a request object wrapping the given request.
      * @throws java.lang.IllegalArgumentException if the request is null
+     
+     * @param request the {@link HttpServletRequest} to be wrapped.
      */
     public HttpServletRequestWrapper(HttpServletRequest request) {
         super(request);
@@ -152,8 +154,17 @@
      public int getIntHeader(String name) {
         return this._getHttpServletRequest().getIntHeader(name);
     }
-    
+
     /**
+     * <p>The default behavior of this method is to
+     * return getServletMapping() on the wrapped request object.</p>
+     */
+     @Override
+     public HttpServletMapping getHttpServletMapping() {
+        return this._getHttpServletRequest().getHttpServletMapping();
+    }
+
+    /**
      * The default behavior of this method is to return getMethod()
      * on the wrapped request object.
      */
@@ -320,7 +331,11 @@
     /**
      * The default behavior of this method is to return isRequestedSessionIdFromUrl()
      * on the wrapped request object.
+     *
+     * @deprecated  As of Version 4.0 of the Java Servlet API,
+     *              use {@link #isRequestedSessionIdFromURL} instead.
      */
+    @Deprecated
     @Override
     public boolean isRequestedSessionIdFromUrl() {
         return this._getHttpServletRequest().isRequestedSessionIdFromUrl();
@@ -388,7 +403,7 @@
     }
 
     /**
-     * Create an instance of <code>HttpUpgradeHandler</code> for an given
+     * Create an instance of <code>HttpUpgradeHandler</code> for a given
      * class and uses it for the http protocol upgrade processing.
      *
      * @since Servlet 3.1
@@ -398,4 +413,37 @@
             throws IOException, ServletException {
         return this._getHttpServletRequest().upgrade(handlerClass);
     }
+
+    /**
+     * The default behavior of this method is to call newPushBuilder on the
+     * wrapped request object.
+     *
+     * @since Servlet 4.0
+     */
+    @Override
+    public PushBuilder newPushBuilder() {
+        return this._getHttpServletRequest().newPushBuilder();
+    }
+
+    /**
+     * The default behavior of this method is to call getTrailerFields on the
+     * wrapped request object.
+     *
+     * @since Servlet 4.0
+     */
+    @Override
+    public Map<String, String> getTrailerFields() {
+        return this._getHttpServletRequest().getTrailerFields();
+    }
+
+    /**
+     * The default behavior of this method is to call isTrailerFieldsReady on the
+     * wrapped request object.
+     *
+     * @since Servlet 4.0
+     */
+    @Override
+    public boolean isTrailerFieldsReady() {
+        return this._getHttpServletRequest().isTrailerFieldsReady();
+    }
 }