[Zope3-checkins] SVN: Zope3/branches/3.3/ Fix issue 383.

[Florent Xicluna]

Log message for revision 69521:
  Fix issue 383.
  Patch on zope.app.server was missing on zope.app.twisted (see rev.30448).
  
  

Changed:
  U   Zope3/branches/3.3/doc/CHANGES.txt
  U   Zope3/branches/3.3/src/zope/app/twisted/schema.xml
  U   Zope3/branches/3.3/zopeskel/etc/zope.conf.in

-=-
Modified: Zope3/branches/3.3/doc/CHANGES.txt
===================================================================
--- Zope3/branches/3.3/doc/CHANGES.txt	2006-08-15 20:02:00 UTC (rev 69520)
+++ Zope3/branches/3.3/doc/CHANGES.txt	2006-08-15 20:02:22 UTC (rev 69521)
@@ -10,11 +10,10 @@
 
     Bugfixes
 
-      - Fixed issue 383: Change default configuration in zope.conf to
-        bind explicitely HTTP server to 127.0.0.1 and give information
-        how to bind to any network interfaces.
-        Note: if you omit to specify host or ip address, there's still
-        a discrepancy between Windows and other platforms.
+      - Fixed issue 383: Twisted and ZServer work the same on any platform.
+        Default configuration is to bind servers to all interfaces.
+        You find additional information in 'zope.conf' to know
+        how to bind to a specific address.
 
       - Fixed issue 574: Page template traversal adapters were not correctly
         proxied.

Modified: Zope3/branches/3.3/src/zope/app/twisted/schema.xml
===================================================================
--- Zope3/branches/3.3/src/zope/app/twisted/schema.xml	2006-08-15 20:02:00 UTC (rev 69520)
+++ Zope3/branches/3.3/src/zope/app/twisted/schema.xml	2006-08-15 20:02:22 UTC (rev 69521)
@@ -4,7 +4,7 @@
 
   <sectiontype name="server" datatype="zope.app.twisted.server.ServerFactory">
     <key name="type" required="yes" />
-    <key name="address" datatype="inet-address" />
+    <key name="address" datatype="inet-binding-address" />
     <key name="backlog" datatype="integer" default="50" />
   </sectiontype>
 

Modified: Zope3/branches/3.3/zopeskel/etc/zope.conf.in
===================================================================
--- Zope3/branches/3.3/zopeskel/etc/zope.conf.in	2006-08-15 20:02:00 UTC (rev 69520)
+++ Zope3/branches/3.3/zopeskel/etc/zope.conf.in	2006-08-15 20:02:22 UTC (rev 69521)
@@ -17,16 +17,14 @@
 
 # Standard HTTP server for Zope 3.
 #
-# HTTP server is explicitely bound to local loopback.
-# You can keep this configuration if your server
-# stays behind a dedicated web server.
-# Alternatively, you can change address to 0.0.0.0:8080,
-# if you need to bind to all network interfaces.
-#
+# HTTP server is bound to all interfaces.
+# You can bind to any IP address or hostname,
+# or use 127.0.0.1:8080 for local loopback.
 # Server: All Servers
+#
 <server>
   type HTTP
-  address 127.0.0.1:8080
+  address 8080
 </server>
 
 # Ready to go HTTPS server. You just need to make sure OpenSSL is installed.
@@ -69,7 +67,7 @@
     path $DATADIR/Data.fs
   </filestorage>
 
-# uncomment this if you want to connect to a local ZEO server
+# Uncomment this if you want to connect to a local ZEO server
 # instead:
 #  <zeoclient>
 #    server localhost:8100