Changeset 730 for branches

Timestamp:

01/30/12 00:32:16 (4 months ago)

Author:

shiretu

Message:

-- fixed a bug in RTMP uri parsing
-- fixed some issues inside config files

File:

• branches/1.0/sources/common/src/utils/misc/uri.cpp (modified) (1 diff)

branches/1.0/sources/common/src/utils/misc/uri.cpp

@@ -204 +204 @@
                 }
 
-                for (string::size_type i = fullDocumentPath.size() - 1; i >= 0; i--) {
-                        if (fullDocumentPath[i] == '/')
-                                break;
-                        document = fullDocumentPath[i] + document;
-                }
-                documentPath = fullDocumentPath.substr(0, fullDocumentPath.size() - document.size());
+                bool rtmpDocument = false;
+
+                if (scheme.find("rtmp") == 0) {
+                        pos = fullDocumentPath.find(':');
+                        if (pos == string::npos) {
+                                rtmpDocument = false;
+                        } else {
+                                pos = fullDocumentPath.rfind('/', pos);
+                                if (pos == string::npos) {
+                                        rtmpDocument = false;
+                                } else {
+                                        rtmpDocument = true;
+                                }
+                        }
+                } else {
+                        rtmpDocument = false;
+                }
+
+                if (rtmpDocument) {
+                        pos = fullDocumentPath.find(':');
+                        pos = fullDocumentPath.rfind('/', pos);
+                        documentPath = fullDocumentPath.substr(0, pos + 1);
+                        document = fullDocumentPath.substr(pos + 1);
+                } else {
+                        for (string::size_type i = fullDocumentPath.size() - 1; i >= 0; i--) {
+                                if (fullDocumentPath[i] == '/')
+                                        break;
+                                document = fullDocumentPath[i] + document;
+                        }
+                        documentPath = fullDocumentPath.substr(0, fullDocumentPath.size() - document.size());
+                }
                 documentWithFullParameters = document;
                 if (fullParameters != "")