[Gnash-commit] gnash ChangeLog server/sprite_instance.cpp

[Udo Giacomozzi]

CVSROOT:        /cvsroot/gnash
Module name:    gnash
Changes by:     Udo Giacomozzi <udog>   08/01/12 13:00:27

Modified files:
        .              : ChangeLog 
        server         : sprite_instance.cpp 

Log message:
        server/sprite_instance.cpp: case-insensitive check for GET/POST; fix 
double "?"

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5385&r2=1.5386
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.443&r2=1.444

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.5385
retrieving revision 1.5386
diff -u -b -r1.5385 -r1.5386
--- ChangeLog   12 Jan 2008 12:48:06 -0000      1.5385
+++ ChangeLog   12 Jan 2008 13:00:26 -0000      1.5386
@@ -1,6 +1,12 @@
 2008-01-12 Udo Giacomozzi <address@hidden>
 
        * libbase/URL.h: add set method for querystring
+       * server/sprite_instance.cpp: case-insensitive check for GET/POST;
+         fix double "?"        
+
+2008-01-12 Udo Giacomozzi <address@hidden>
+
+       * libbase/URL.h: add set method for querystring
        * server/sprite_instance.{cpp,h}: implement GET and POST for 
          loadVariables()       
 

Index: server/sprite_instance.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.443
retrieving revision 1.444
diff -u -b -r1.443 -r1.444
--- server/sprite_instance.cpp  12 Jan 2008 12:48:06 -0000      1.443
+++ server/sprite_instance.cpp  12 Jan 2008 13:00:27 -0000      1.444
@@ -675,10 +675,16 @@
 
        if (fn.nargs > 1)
        {        
-               const std::string& methodstring = fn.arg(1).to_string();
-               // Should we be case-insensitive in comparing these ? Anwer: 
YES! [TODO]
-               if ( methodstring == "GET" ) method = 1;
-               else if ( methodstring == "POST" ) method = 2;
+  
+    boost::intrusive_ptr<as_object> methodstr = fn.arg(1).to_object();
+    assert(methodstr);
+    
+    string_table& st = sprite->getVM().getStringTable();
+    as_value lc = methodstr->callMethod(st.find(PROPNAME("toLowerCase")));
+    std::string methodstring = lc.to_string(); 
+  
+    if ( methodstring == "get" ) method = 1;
+    else if ( methodstring == "post" ) method = 2;
        }
 
        sprite->loadVariables(url, method);
@@ -3952,12 +3958,8 @@
     std::string del = "";
     std::string data = "";
     
-    if ( sendVarsMethod == 1 ) {  // GET
-      if (url.querystring() != "")
+    if ( (sendVarsMethod == 1) && (url.querystring() != "") )  // GET
         del = "&";
-      else 
-        del = "?";
-    }
     
     for (PropMap::iterator i=props.begin(), e=props.end(); i!=e; ++i)
     {