[Gnash-commit] gnash ChangeLog server/asobj/System.cpp

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/04/11 08:43:41

Modified files:
        .              : ChangeLog 
        server/asobj   : System.cpp 

Log message:
                * server/asobj/System.cpp: add hasTLS property, reorder server 
string
                  to match pp and document.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6248&r2=1.6249
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/System.cpp?cvsroot=gnash&r1=1.24&r2=1.25

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6248
retrieving revision 1.6249
diff -u -b -r1.6248 -r1.6249
--- ChangeLog   11 Apr 2008 08:35:00 -0000      1.6248
+++ ChangeLog   11 Apr 2008 08:43:41 -0000      1.6249
@@ -1,5 +1,10 @@
 2008-04-11 Benjamin Wolsey <address@hidden>
 
+       * server/asobj/System.cpp: add hasTLS property, reorder server string
+         to match pp and document.
+
+2008-04-11 Benjamin Wolsey <address@hidden>
+
        * testsuite/actionscript.all/System.as: tests for undocumented
          functions.
 

Index: server/asobj/System.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/System.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- server/asobj/System.cpp     9 Apr 2008 11:57:35 -0000       1.24
+++ server/asobj/System.cpp     11 Apr 2008 08:43:41 -0000      1.25
@@ -79,6 +79,9 @@
        // Override in gnashrc
        const std::string manufacturer = rcfile.getFlashSystemManufacturer();
 
+       // Does the NetStream object natively support SSL?
+       const bool hasTLS = false;
+
     //
        // Media
        //
@@ -126,12 +129,9 @@
         ss >> screenResolutionX;
         
         ss.clear();
-        
         
ss.str((*movie_root::interfaceHandle)("System.capabilities.screenResolutionY", 
""));
         ss >> screenResolutionY;
         
-        ss.clear();
-        
         pixelAspectRatio = 
(*movie_root::interfaceHandle)("System.capabilities.pixelAspectRatio", "");
         playerType = 
(*movie_root::interfaceHandle)("System.capabilities.playerType", "");
     }
@@ -143,32 +143,44 @@
        // values that might affect privacy can be overridden   
        // in gnashrc.
 
+       // hasIME seems not to be included in the server string, though
+       // it is documented to have a server string of IME.
+       // Linux player version 9 has no hasIME property (but no need
+       // to emulate that.)
+       
+       // TLS and hasTLS are documented for AS3, player version 9.
+       //
+       // WD is included in the server string for player version 9,
+       // but not documented.
+       
+       // This should be the standard order of parameters in the server
+       // string.
        std::ostringstream serverString;
-       serverString << "OS=" << URL::encode(os) 
-                       << "&A="    << TF(hasAudio)
-                       << "&V="    << URL::encode(version)
-                       << "&PT="   << playerType
-                       << "&L="    << language
-                       << "&AVD="      << avHardwareDisable 
-                       << "&ACC="      << hasAccessibility 
-                       << "&AE="       << hasAudioEncoder 
+       serverString << "&A="    << TF(hasAudio)
+                       << "&SA="       << hasStreamingAudio
+                       << "&SV="       << hasStreamingVideo 
                        << "&EV="       << hasEmbeddedVideo 
-                       << "&IME="      << hasIME 
                        << "&MP3="      << hasMP3 
+                       << "&AE="       << hasAudioEncoder
+                       << "&VE="       << hasVideoEncoder
+                       << "&ACC="      << hasAccessibility
                        << "&PR="       << hasPrinting 
-                       << "&SB="       << hasScreenBroadcast 
                        << "&SP="       << hasScreenPlayback 
-                       << "&SA="       << hasStreamingAudio 
-                       << "&SV="       << hasStreamingVideo 
-                       << "&VE="       << hasVideoEncoder 
+                       << "&SB="       << hasScreenBroadcast 
                        << "&DEB="      << isDebugger 
-                       << "&LFD="      << localFileReadDisable 
+                       << "&V="    << URL::encode(version)
                        << "&M="    << URL::encode(manufacturer)
-                       << "&AR="   << pixelAspectRatio
-                       << "&COL="      // screenColor (?)
-                       << "&DP="       // screenDPI (int?)
                        << "&R="    << screenResolutionX << "x" << 
screenResolutionY
-                       ;
+                       << "&DP="       // screenDPI (int?
+                       << "&COL="      // screenColor (?)                      
                        
+                       << "&AR="   << pixelAspectRatio
+                       << "OS="    << URL::encode(os)
+                       << "&L="    << language                 
+                       << "&PT="   << playerType
+                       << "&AVD="      << avHardwareDisable 
+                       << "&LFD="      << localFileReadDisable
+                       << "&WD="
+                       << "&TLS="      << hasTLS;
                
        static boost::intrusive_ptr<as_object> proto;
        if ( proto == NULL )
@@ -203,6 +215,7 @@
                proto->init_member("hasAccessibility", hasAccessibility, flags);
                proto->init_member("isDebugger", isDebugger, flags);
                proto->init_member("localFileReadDisable", 
localFileReadDisable, flags);
+               proto->init_member("hasTLS", hasTLS, flags);
        }
        return proto.get();
 }