[Gnash-commit] /srv/bzr/gnash/trunk r11928: initialize the entry point for rtmp connections. Strip a leading '/' off in initModule(), not higher up.

[Rob Savoye]

------------------------------------------------------------
revno: 11928
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Tue 2010-02-09 14:15:33 -0700
message:
  initialize the entry point for rtmp connections. Strip a leading '/' off in 
initModule(), not higher up.
modified:
  cygnal/cygnal.cpp
  cygnal/handler.cpp

=== modified file 'cygnal/cygnal.cpp'
--- a/cygnal/cygnal.cpp 2010-01-24 17:16:59 +0000
+++ b/cygnal/cygnal.cpp 2010-02-09 21:15:33 +0000
@@ -925,10 +925,11 @@
                hand->addClient(args->netfd, Network::RTMP);
                args->handler = reinterpret_cast<void *>(hand.get());
                args->filespec = key;
+               args->entry = rtmp;
                
                string cgiroot;
                char *env = std::getenv("CYGNAL_PLUGINS");
-               if (!env) {
+               if (env != 0) {
                    cgiroot = env;
                }
                if (crcfile.getCgiRoot().size() > 0) {
@@ -938,12 +939,8 @@
                    cgiroot = PLUGINSDIR;
                }
                hand->scanDir(cgiroot);
-               string str(url.path());
-               if (str[0] == '/') {
-                   str.erase(0,1);
-               }
                boost::shared_ptr<Handler::cygnal_init_t> init = 
-                   hand->initModule(str);
+                   hand->initModule(url.path());
                
                // this is where the real work gets done.
                if (init) {
@@ -1134,7 +1131,7 @@
                      done = true;
                      break;
                }
-               delete args->buffer;
+//             delete args->buffer;
            }
        }
 

=== modified file 'cygnal/handler.cpp'
--- a/cygnal/handler.cpp        2010-01-01 20:41:28 +0000
+++ b/cygnal/handler.cpp        2010-02-09 21:15:33 +0000
@@ -278,12 +278,21 @@
 }
 
 boost::shared_ptr<Handler::cygnal_init_t>
-Handler::initModule(const std::string& module)
+Handler::initModule(const std::string& str)
 {
     // GNASH_REPORT_FUNCTION;
 
+    if (str.empty()) {
+       return _plugin;
+    }
+
+    string module = str;
+    if (module[0] == '/') {
+       module.erase(0,1);
+    }
+    
     SharedLib *sl;
-    std::string symbol(module);
+    string symbol(module);
 
     _pluginsdir = PLUGINSDIR;
     log_security(_("Initializing module: \"%s\" from %s"), symbol, 
_pluginsdir);