Merge remote-tracking branch 'origin/jetty-9.2.x'

Conflicts:
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/GzipHandler.java

3 files changed, 75 insertions, 19 deletions

diff --git a/NOTICE.txt b/NOTICE.txt
index 0555240dd5..454c3d44d1 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -18,9 +18,63 @@ Jetty is dual licensed under both
 
 Jetty may be distributed under either license.
 
-The javax.servlet package used was sourced from the Apache
-Software Foundation and is distributed under the apache 2.0
-license.
+
+------
+Oracle
+
+The following artifacts are CDDL + GPLv2 with classpath exception.
+
+https://glassfish.dev.java.net/nonav/public/CDDL+GPL.html
+
+javax.servlet:javax.servlet-api
+javax.servlet.jsp:javax.servlet.jsp-api
+org.glassfish.web:javax.servlet.jsp
+org.glassfish.web:javax.servlet.jsp
+org.glassfish.web:javax.servlet.jsp.jstl
+org.eclipse.jetty.orbit.javax.servlet.jsp.jstl
+
+
+------
+Apache
+
+The following artifacts are ASL2 licensed.
+
+org.apache.taglibs:taglibs-standard-spec
+org.apache.taglibs:taglibs-standard-impl
+
+
+------
+MortBay
+
+The following artifacts are ASL2 licensed.  Based on selected classes from 
+following Apache Tomcat jars, all ASL2 licensed.
+
+org.mortbay.jasper:apache-jsp
+  org.apache.tomcat:tomcat-jasper
+  org.apache.tomcat:tomcat-juli
+  org.apache.tomcat:tomcat-jsp-api
+  org.apache.tomcat:tomcat-el-api
+  org.apache.tomcat:tomcat-jasper-el
+  org.apache.tomcat:tomcat-api
+  org.apache.tomcat:tomcat-util-scan
+  org.apache.tomcat:tomcat-util
+
+org.mortbay.jasper:apache-el
+  org.apache.tomcat:tomcat-jasper-el
+  org.apache.tomcat:tomcat-el-api
+
+
+------
+Mortbay
+
+The following artifacts are CDDL + GPLv2 with classpath exception.
+
+https://glassfish.dev.java.net/nonav/public/CDDL+GPL.html
+
+org.eclipse.jetty.toolchain:jetty-schemas
+
+------
+Assorted
 
 The UnixCrypt.java code implements the one way cryptography used by
 Unix systems for simple password protection.  Copyright 1996 Aki Yoshida,
@@ -28,4 +82,3 @@ modified April 2001  by Iris Van den Broeke, Daniel Deville.
 Permission to use, copy, modify and distribute UnixCrypt
 for non-commercial or commercial purposes and without fee is
 granted provided that the copyright notice appears in all copies.
-
diff --git a/jetty-distribution/src/main/resources/bin/jetty.sh b/jetty-distribution/src/main/resources/bin/jetty.sh
index e96a998067..da6f571a6e 100755
--- a/jetty-distribution/src/main/resources/bin/jetty.sh
+++ b/jetty-distribution/src/main/resources/bin/jetty.sh
@@ -328,7 +328,7 @@ fi
 
 if [ -z "$JAVA" ]
 then
-  echo "Cannot find a Java JDK. Please set either set JAVA or put java (>=1.5) in your PATH." 2>&2
+  echo "Cannot find a Java JDK. Please set either set JAVA or put java (>=1.5) in your PATH." >&2
   exit 1
 fi
 
@@ -382,9 +382,10 @@ JAVA_OPTIONS=(${JAVA_OPTIONS[*]} "-Djetty.home=$JETTY_HOME" "-Djetty.base=$JETTY
 
 JETTY_START=$JETTY_HOME/start.jar
 START_INI=$JETTY_BASE/start.ini
-if [ ! -f "$START_INI" ]
+START_D=$JETTY_BASE/start.d
+if [ ! -f "$START_INI" -a ! -d "$START_D" ]
 then
-  echo "Cannot find a start.ini in your JETTY_BASE directory: $JETTY_BASE" 2>&2
+  echo "Cannot find a start.ini file or a start.d directory in your JETTY_BASE directory: $JETTY_BASE" >&2
   exit 1
 fi
 
@@ -402,6 +403,7 @@ RUN_CMD=("$JAVA" ${RUN_ARGS[@]})
 if (( DEBUG ))
 then
   echo "START_INI      =  $START_INI"
+  echo "START_D        =  $START_D"
   echo "JETTY_HOME     =  $JETTY_HOME"
   echo "JETTY_BASE     =  $JETTY_BASE"
   echo "JETTY_CONF     =  $JETTY_CONF"
@@ -562,6 +564,7 @@ case "$ACTION" in
   check|status)
     echo "Checking arguments to Jetty: "
     echo "START_INI      =  $START_INI"
+    echo "START_D        =  $START_D"
     echo "JETTY_HOME     =  $JETTY_HOME"
     echo "JETTY_BASE     =  $JETTY_BASE"
     echo "JETTY_CONF     =  $JETTY_CONF"
diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java
index 3385d17e00..6c42b7e7e8 100644
--- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java
+++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java
@@ -1166,8 +1166,8 @@ public class StandardDescriptorProcessor extends IterativeDescriptorProcessor
 
         String location = node.getString("location", false, true);
         ErrorPageErrorHandler handler = (ErrorPageErrorHandler)context.getErrorHandler();
-        
-        switch (context.getMetaData().getOrigin("error."+error))
+        String originName = "error."+error;
+        switch (context.getMetaData().getOrigin(originName))
         {
             case NotSet:
             {
@@ -1183,19 +1183,19 @@ public class StandardDescriptorProcessor extends IterativeDescriptorProcessor
             case WebDefaults:
             case WebOverride:
             {
-                //an error page setup was set in web.xml, only allow other web xml descriptors to override it
+                //an error page setup was set in web.xml/webdefault.xml/web-override.xml, only allow other web xml descriptors to override it
                 if (!(descriptor instanceof FragmentDescriptor))
                 {
-                    if (descriptor instanceof OverrideDescriptor || descriptor instanceof DefaultsDescriptor)
-                    {
-                        if (code>0)
-                            handler.addErrorPage(code,location);
-                        else
-                            handler.addErrorPage(error,location);
-                        context.getMetaData().setOrigin("error."+error, descriptor);
-                    }
+                    //if set twice in the same descriptor, its an error
+                    Descriptor originDescriptor = context.getMetaData().getOriginDescriptor(originName);
+                    if (descriptor == originDescriptor)
+                        throw new IllegalStateException("Duplicate error-page "+error+" at "+location);
+
+                    if (code>0)
+                        handler.addErrorPage(code,location);
                     else
-                        throw new IllegalStateException("Duplicate global error-page "+location);
+                        handler.addErrorPage(error,location);
+                    context.getMetaData().setOrigin("error."+error, descriptor);
                 }
                 break;
             }