You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2016/01/31 18:38:57 UTC
jena git commit: JENA-1125: Provide for all possible choices of
"Server:" output.
Repository: jena
Updated Branches:
refs/heads/master f6d71d6bf -> 04b8d861c
JENA-1125: Provide for all possible choices of "Server:" output.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/04b8d861
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/04b8d861
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/04b8d861
Branch: refs/heads/master
Commit: 04b8d861ce0b5238cba66306c518ea7d801f9496
Parents: f6d71d6
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Jan 31 17:38:49 2016 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Jan 31 17:38:49 2016 +0000
----------------------------------------------------------------------
.../src/main/java/org/apache/jena/fuseki/Fuseki.java | 9 ++++++---
.../main/java/org/apache/jena/fuseki/jetty/JettyFuseki.java | 3 +--
.../java/org/apache/jena/fuseki/servlets/ServletBase.java | 2 +-
3 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/04b8d861/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/Fuseki.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/Fuseki.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/Fuseki.java
index c2c0783..927c330 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/Fuseki.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/Fuseki.java
@@ -112,18 +112,21 @@ public class Fuseki {
/** Are we in development mode? That means a SNAPSHOT, or no VERSION
* because maven has not filtered the fuseki-properties.xml file.
*/
- public static final boolean developmentMode ;
+ public static boolean developmentMode ;
static {
// See ServletBase.setCommonheaders
// If it look like a SNAPSHOT, or it's not set, we are in development mode.
developmentMode = ( VERSION == null || VERSION.equals("development") || VERSION.contains("SNAPSHOT") ) ;
}
+ public static boolean outputJettyServerHeaders = developmentMode ;
+ public static boolean outputFusekiServerHeaders = developmentMode ;
+
/** An identifier for the HTTP Fuseki server instance */
- static public final String serverHttpName = NAME + " (" + VERSION + ")" ;
+ static public final String serverHttpName = NAME + " (" + VERSION + ")" ;
/** An additional identifier for the HTTP Fuseki server instance in a development build */
- static public final String serverHttpNameDev ;
+ static public final String serverHttpNameDev ;
static {
// See ServletBase.setCommonheaders
if ( developmentMode )
http://git-wip-us.apache.org/repos/asf/jena/blob/04b8d861/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/jetty/JettyFuseki.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/jetty/JettyFuseki.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/jetty/JettyFuseki.java
index af3df23..2b1c32c 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/jetty/JettyFuseki.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/jetty/JettyFuseki.java
@@ -71,7 +71,6 @@ public class JettyFuseki {
public static final String resourceBase1 = "webapp" ;
// Development
public static final String resourceBase2 = "src/main/webapp" ;
-
/**
* Default setup which requires a {@link org.apache.jena.fuseki.jetty.JettyServerConfig}
@@ -277,7 +276,7 @@ public class JettyFuseki {
f1.getHttpConfiguration().setRequestHeaderSize(512 * 1024);
f1.getHttpConfiguration().setOutputBufferSize(5 * 1024 * 1024) ;
// Do not add "Server: Jetty(....) when not a development system.
- if ( ! Fuseki.developmentMode )
+ if ( ! Fuseki.outputJettyServerHeaders )
f1.getHttpConfiguration().setSendServerVersion(false) ;
// https is better done with a Jetty configuration file
http://git-wip-us.apache.org/repos/asf/jena/blob/04b8d861/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java
index c051e9e..393f879 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java
@@ -97,7 +97,7 @@ public abstract class ServletBase extends HttpServlet {
public static void setCommonHeaders(HttpServletResponse httpResponse) {
if ( CORS_ENABLED )
httpResponse.setHeader(HttpNames.hAccessControlAllowOrigin, "*") ;
- if ( Fuseki.developmentMode ) {
+ if ( Fuseki.outputFusekiServerHeaders ) {
httpResponse.setHeader(HttpNames.hServer, Fuseki.serverHttpName) ;
if ( Fuseki.serverHttpNameDev != null )
httpResponse.setHeader("X-"+HttpNames.hServer, Fuseki.serverHttpNameDev) ;
Re: jena git commit: JENA-1125: Provide for all possible choices of
"Server:" output.
Posted by Andy Seaborne <an...@apache.org>.
On 01/02/16 11:11, Rob Vesse wrote:
> On 31/01/2016 17:38, "andy@apache.org" <an...@apache.org> wrote:
>
>> httpResponse.setHeader("X-"+HttpNames.hServer,
>> Fuseki.serverHttpNameDev) ;
>
> Note that per RFC 6648 [1] we should avoid using X- headers where possible
>
> Rob
>
> [1] http://tools.ietf.org/html/rfc6648
>
>
>
>
If only goes out in developer mode, not in production ("production" = a
release with a proper version number). The key piece of information is
the build date for SNAPSHOTs.
As it nowadays adds nothing, it has been removed it.
Andy
Re: jena git commit: JENA-1125: Provide for all possible choices of
"Server:" output.
Posted by Rob Vesse <rv...@dotnetrdf.org>.
On 31/01/2016 17:38, "andy@apache.org" <an...@apache.org> wrote:
> httpResponse.setHeader("X-"+HttpNames.hServer,
>Fuseki.serverHttpNameDev) ;
Note that per RFC 6648 [1] we should avoid using X- headers where possible
Rob
[1] http://tools.ietf.org/html/rfc6648