[Gnash-commit] gnash ChangeLog server/URLAccessManager.cpp ser...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/10/20 06:00:13

Modified files:
        .              : ChangeLog 
        server         : URLAccessManager.cpp URLAccessManager.h 
        server/asobj   : xmlsocket.cpp 

Log message:
                * server/URLAccessManager.{cpp,h}, server/asobj/xmlsocket.cpp
                  Don't expose allowHost w/out port, rename allowHost (with 
port)
                  to allowXMLSocket.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4650&r2=1.4651
http://cvs.savannah.gnu.org/viewcvs/gnash/server/URLAccessManager.cpp?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/server/URLAccessManager.h?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlsocket.cpp?cvsroot=gnash&r1=1.35&r2=1.36

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4650
retrieving revision 1.4651
diff -u -b -r1.4650 -r1.4651
--- ChangeLog   19 Oct 2007 15:43:37 -0000      1.4650
+++ ChangeLog   20 Oct 2007 06:00:12 -0000      1.4651
@@ -1,3 +1,9 @@
+2007-10-20 Sandro Santilli <address@hidden>
+
+       * server/URLAccessManager.{cpp,h}, server/asobj/xmlsocket.cpp
+         Don't expose allowHost w/out port, rename allowHost (with port)
+         to allowXMLSocket.
+
 2007-10-19 Udo Giacomozzi <address@hidden>
 
        * gui/fb.cpp: Added a few more key scan codes

Index: server/URLAccessManager.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/URLAccessManager.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- server/URLAccessManager.cpp 1 Jul 2007 10:54:19 -0000       1.18
+++ server/URLAccessManager.cpp 20 Oct 2007 06:00:13 -0000      1.19
@@ -265,12 +265,6 @@
 }
 
 bool
-allowHost(const std::string& host, short /* port */)
-{
-       return allowHost(host);
-}
-
-bool
 allowHost(const std::string& host)
 {
        if (host.size() == 0) {
@@ -280,6 +274,13 @@
 }
 
 bool
+allowXMLSocket(const std::string& host, short /* port */)
+{
+       return allowHost(host);
+}
+
+
+bool
 allow(const URL& url)
 {
        // We might reintroduce use of an AccessPolicy cache

Index: server/URLAccessManager.h
===================================================================
RCS file: /sources/gnash/gnash/server/URLAccessManager.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- server/URLAccessManager.h   1 Jul 2007 10:54:19 -0000       1.6
+++ server/URLAccessManager.h   20 Oct 2007 06:00:13 -0000      1.7
@@ -40,9 +40,10 @@
 ///
 bool allow(const URL& url);
 
-bool allowHost(const std::string& str);
+//bool allowHost(const std::string& str);
 
-bool allowHost(const std::string& str, short port);
+// Used by XMLSocket::connect (and others?)
+bool allowXMLSocket(const std::string& str, short port);
 
 } // AccessManager
 

Index: server/asobj/xmlsocket.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlsocket.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- server/asobj/xmlsocket.cpp  10 Oct 2007 14:53:17 -0000      1.35
+++ server/asobj/xmlsocket.cpp  20 Oct 2007 06:00:13 -0000      1.36
@@ -138,7 +138,7 @@
 {
     GNASH_REPORT_FUNCTION;
 
-    if ( ! URLAccessManager::allowHost(host, port) )
+    if ( ! URLAccessManager::allowXMLSocket(host, port) )
     {
            return false;
     }