***SPAM*** [OpenSRF-GIT] OpenSRF branch master updated. db4e107a1bad0cb5204c4946b805d11252446d3f

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OpenSRF".

The branch, master has been updated
       via  db4e107a1bad0cb5204c4946b805d11252446d3f (commit)
      from  5e2221e546cd55e884b2984966aa9dc3468f63c7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit db4e107a1bad0cb5204c4946b805d11252446d3f
Author: Ben Shum <bshum at biblio.org>
Date:   Mon Nov 10 12:20:31 2014 -0500

    LP#1391248: Fix NameVirtualHost warnings in websockets apache2.conf
    
    For the websockets configuration, the sample apache2.conf for Apache 2.4 (i.e.
    Ubuntu 14.04, etc.) contains NameVirtualHost entries that are no longer
    needed.
    
    When starting apache2-websockets, you may see warnings like:
    
    AH00548: NameVirtualHost has no effect and will be removed in the next
    release /etc/apache2-websockets/apache2.conf:53
    
    Remove the NameVirtualHost entries and these warnings go away.
    
    Signed-off-by: Ben Shum <bshum at biblio.org>
    Signed-off-by: Bill Erickson <berickxx at gmail.com>

diff --git a/examples/apache_24/websockets/apache2.conf b/examples/apache_24/websockets/apache2.conf
index 9076b5c..64e6a4c 100644
--- a/examples/apache_24/websockets/apache2.conf
+++ b/examples/apache_24/websockets/apache2.conf
@@ -50,7 +50,6 @@ LogFormat "%{User-agent}i" agent
 
 # WebSockets via SSL
 Listen 7682
-NameVirtualHost *:7682
 <VirtualHost *:7682>
     DocumentRoot /var/www
     ServerName localhost:7682
@@ -66,7 +65,6 @@ NameVirtualHost *:7682
 
 # WebSockets via non-SSL
 Listen 7680
-NameVirtualHost *:7680
 <VirtualHost *:7680>
     ServerName localhost:7680
     ServerAlias 127.0.0.1:7680

-----------------------------------------------------------------------

Summary of changes:
 examples/apache_24/websockets/apache2.conf |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
OpenSRF