cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardContext.java StandardHost.java StandardWrapperValve.java mbeans-descriptors.xml
luehe 2003/07/22 14:01:27 Modified:catalina/src/share/org/apache/catalina Context.java Host.java catalina/src/share/org/apache/catalina/core StandardContext.java StandardHost.java StandardWrapperValve.java mbeans-descriptors.xml Log: Moved X-Powered-By property for servlets from Host/Context to CoyoteConnector. If property is set to TRUE, CoyoteAdapter adds X-Powered-By response header with value Servlet/2,4. Turned X-Powered-By property for JSPs into a configurable Jasper compilation option. If set to TRUE, the generated servlet will add X-Powered-By response header with value JSP/2.0. Revision ChangesPath 1.8 +4 -27 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Context.java Index: Context.java === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Context.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Context.java 21 Jul 2003 19:05:50 - 1.7 +++ Context.java 22 Jul 2003 21:01:26 - 1.8 @@ -427,29 +427,6 @@ public void setWrapperClass(String wrapperClass); -/** - * Indicates whether the generation of an X-Powered-By response header for - * servlet-generated responses is enabled or disabled for this Context. - * - * p Unless explicitly set on this Context, this method returns the - * X-Powered-By setting of the Host with which this Context is associated. - * - * @return true if generation of X-Powered-By response header is enabled, - * false otherwise - */ -public boolean isXpoweredBy(); - - -/** - * Enables or disables the generation of an X-Powered-By header (with value - * Servlet/2.4) for all servlet-generated responses from this Context. - * - * @param xpoweredBy true if generation of X-Powered-By response header is - * to be enabled, false otherwise - */ -public void setXpoweredBy(boolean xpoweredBy); - - // - Public Methods 1.6 +4 -25 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Host.java Index: Host.java === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Host.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Host.java 21 Jul 2003 19:05:50 - 1.5 +++ Host.java 22 Jul 2003 21:01:26 - 1.6 @@ -227,27 +227,6 @@ public void setXmlNamespaceAware(boolean xmlNamespaceAware); -/** - * Indicates whether the generation of an X-Powered-By response header for - * servlet-generated responses is enabled or disabled for this Host. - * - * @return true if generation of X-Powered-By response header is enabled, - * false otherwise - */ -public boolean isXpoweredBy(); - - -/** - * Enables or disables the generation of an X-Powered-By header (with value - * Servlet/2.4) for all servlet-generated responses from contexts - * registered with this Host. - * - * @param xpoweredBy true if generation of X-Powered-By response header is - * to be enabled, false otherwise - */ -public void setXpoweredBy(boolean xpoweredBy); - - // - Public Methods 1.74 +1 -57 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java Index: StandardContext.java === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- StandardContext.java 22 Jul 2003 18:51:21 - 1.73 +++ StandardContext.java 22 Jul 2003 21:01:26 - 1.74 @@ -276,18 +276,6 @@ private boolean distributable = false; -/* - * Enables/disables generation of X-Powered-By response header - */ -private boolean xpoweredBy; - - -/* - * Indicates whether setter for X-Powered-By property was explicitly called - */ -private boolean xpoweredBySetterCalled; - - /** * The document root for this web application. */ @@ -4364,50 +4352,6 @@ } } -} - - -/** - * Indicates whether the generation of an X-Powered-By response header for - * servlet-generated responses is enabled or disabled for this Context. - * - * p Unless
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardContext.java StandardHost.java StandardWrapperValve.java mbeans-descriptors.xml
luehe 2003/07/21 12:05:51 Modified:catalina/src/share/org/apache/catalina Context.java Host.java catalina/src/share/org/apache/catalina/core StandardContext.java StandardHost.java StandardWrapperValve.java mbeans-descriptors.xml Log: Added support for X-Powered-By response header, as defined by the Servlet 2.4 and JSP 2.0 specs. The Servlet 2.4 spec defines a special X-Powered-By: Servlet/2.4 header, which containers may add to servlet-generated responses. This is complemented by the JSP 2.0 spec, which defines a X-Powered-By: JSP/2.0 header to be added (on an optional basis) to responses utilizing JSP technology. The goal of these headers is to aid in gathering statistical data about the use of Servlet and JSP technology Revision ChangesPath 1.7 +27 -4 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Context.java Index: Context.java === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Context.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Context.java 19 May 2003 21:56:28 - 1.6 +++ Context.java 21 Jul 2003 19:05:50 - 1.7 @@ -427,6 +427,29 @@ public void setWrapperClass(String wrapperClass); +/** + * Indicates whether the generation of an X-Powered-By response header for + * servlet-generated responses is enabled or disabled for this Context. + * + * p Unless explicitly set on this Context, this method returns the + * X-Powered-By setting of the Host with which this Context is associated. + * + * @return true if generation of X-Powered-By response header is enabled, + * false otherwise + */ +public boolean isXpoweredBy(); + + +/** + * Enables or disables the generation of an X-Powered-By header (with value + * Servlet/2.4) for all servlet-generated responses from this Context. + * + * @param xpoweredBy true if generation of X-Powered-By response header is + * to be enabled, false otherwise + */ +public void setXpoweredBy(boolean xpoweredBy); + + // - Public Methods 1.5 +25 -4 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Host.java Index: Host.java === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Host.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Host.java 15 Jun 2003 13:03:11 - 1.4 +++ Host.java 21 Jul 2003 19:05:50 - 1.5 @@ -227,6 +227,27 @@ public void setXmlNamespaceAware(boolean xmlNamespaceAware); +/** + * Indicates whether the generation of an X-Powered-By response header for + * servlet-generated responses is enabled or disabled for this Host. + * + * @return true if generation of X-Powered-By response header is enabled, + * false otherwise + */ +public boolean isXpoweredBy(); + + +/** + * Enables or disables the generation of an X-Powered-By header (with value + * Servlet/2.4) for all servlet-generated responses from contexts + * registered with this Host. + * + * @param xpoweredBy true if generation of X-Powered-By response header is + * to be enabled, false otherwise + */ +public void setXpoweredBy(boolean xpoweredBy); + + // - Public Methods 1.72 +57 -3 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java Index: StandardContext.java === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- StandardContext.java 20 Jul 2003 14:52:17 - 1.71 +++ StandardContext.java 21 Jul 2003 19:05:50 - 1.72 @@ -276,6 +276,18 @@ private boolean distributable = false; +/* + * Enables/disables generation of X-Powered-By response header + */ +private boolean xpoweredBy; + + +/* + * Indicates whether setter for X-Powered-By property was explicitly called + */ +private boolean xpoweredBySetterCalled; + + /** * The document root for this web application. */ @@ -1600,7 +1612,6 @@ * @param errorPage The error page definition to be added */
