From: <bsc...@us...> - 2009-01-29 10:15:41
|
Revision: 4080 http://unicore.svn.sourceforge.net/unicore/?rev=4080&view=rev Author: bschuller Date: 2009-01-29 10:15:34 +0000 (Thu, 29 Jan 2009) Log Message: ----------- bugfix: only listen on specified interface; add AJP/httpd doc from Xavier to GW.doc Modified Paths: -------------- gateway/trunk/Changes.txt gateway/trunk/docs/GW.doc gateway/trunk/src/main/java/eu/unicore/gateway/base/CustomSslSocketConnector.java gateway/trunk/src/main/java/eu/unicore/gateway/base/JettyServer.java Modified: gateway/trunk/Changes.txt =================================================================== --- gateway/trunk/Changes.txt 2009-01-28 16:56:06 UTC (rev 4079) +++ gateway/trunk/Changes.txt 2009-01-29 10:15:34 UTC (rev 4080) @@ -5,6 +5,9 @@ 6.2.0 - improved logging. All loggers have prefix "unicore.gateway", and the logging file config is periodically checked for changes. + - bugfix: gateway will now listen only on the specified network interface, or, + if "0.0.0.0" is used as host, on all interfaces + - documentation on AJP/httpd configuration (contributed by Xavier Delaruelle) 6.1.3 - experimental support for "gateway plugins", for tunneling other protocols through the Modified: gateway/trunk/docs/GW.doc =================================================================== (Binary files differ) Modified: gateway/trunk/src/main/java/eu/unicore/gateway/base/CustomSslSocketConnector.java =================================================================== --- gateway/trunk/src/main/java/eu/unicore/gateway/base/CustomSslSocketConnector.java 2009-01-28 16:56:06 UTC (rev 4079) +++ gateway/trunk/src/main/java/eu/unicore/gateway/base/CustomSslSocketConnector.java 2009-01-29 10:15:34 UTC (rev 4080) @@ -73,6 +73,7 @@ private transient Password keyPassword; private transient Password trustPassword; + @Override protected void configure(Socket socket)throws IOException{ InetSocketAddress peer=(InetSocketAddress)socket.getRemoteSocketAddress(); if(log.isDebugEnabled() && peer!=null && peer.getAddress()!=null){ Modified: gateway/trunk/src/main/java/eu/unicore/gateway/base/JettyServer.java =================================================================== --- gateway/trunk/src/main/java/eu/unicore/gateway/base/JettyServer.java 2009-01-28 16:56:06 UTC (rev 4079) +++ gateway/trunk/src/main/java/eu/unicore/gateway/base/JettyServer.java 2009-01-29 10:15:34 UTC (rev 4080) @@ -150,14 +150,18 @@ protected void initServer() throws Exception{ System.setProperty("org.mortbay.log.class", JettyLogger.class.getName()); - String host=gatewayProperties.getProperty(GatewayProperties.KEYS.hostname); - url=URI.create(host); + String hostProp=gatewayProperties.getProperty(GatewayProperties.KEYS.hostname); + url=URI.create(hostProp); try{ port=url.getPort(); host=url.getHost(); }catch(Exception e){} - - logger.info("Starting Jetty on "+host); + if("0.0.0.0".equals(host)){ + logger.info("Starting Jetty, will listen on all network interfaces."); + } + else{ + logger.info("Starting Jetty on "+host); + } theServer=new Server(); Connector connector=null; if(getBooleanProperty(ENABLE_AJP,false)){ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |