[Gnash-commit] gnash/cygnal testsuite/cygnal.all/test_http.cpp...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    08/03/22 04:05:56

Modified files:
        cygnal/testsuite/cygnal.all: test_http.cpp 
        cygnal         : http.h http.cpp ChangeLog 

Log message:
                * testsuite/cygnal.all/test_http.cpp: Fix so it compiles
                again. The API changed to use Network::byte_t instead of 
uint8_t.
                * http.{h,cpp}: Return std::string &, not just a reference.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/cygnal/testsuite/cygnal.all/test_http.cpp?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/cygnal/http.h?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/cygnal/http.cpp?cvsroot=gnash&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gnash/cygnal/ChangeLog?cvsroot=gnash&r1=1.13&r2=1.14

Patches:
Index: testsuite/cygnal.all/test_http.cpp
===================================================================
RCS file: /sources/gnash/gnash/cygnal/testsuite/cygnal.all/test_http.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- testsuite/cygnal.all/test_http.cpp  21 Jan 2008 20:56:09 -0000      1.6
+++ testsuite/cygnal.all/test_http.cpp  22 Mar 2008 04:05:55 -0000      1.7
@@ -41,6 +41,7 @@
 #include "log.h"
 #include "http.h"
 #include "dejagnu.h"
+#include "network.h"
 
 using namespace cygnal;
 using namespace gnash;
@@ -267,7 +268,7 @@
 
     // Check formatHeader()
     http.clearHeader();
-    http.formatHeader(RTMP);
+    http.formatHeader(HTTP::LIFE_IS_GOOD);
 //    cerr << "FIXME: " << http.getHeader() << endl;
     regcomp (&regex_pat, "HTTP/1.1 200 
OK.*Date:.*Connection:.*-Length.*-Type:.*$",
              REG_NOSUB);        // note that we do want to look for NL
@@ -304,7 +305,7 @@
     // Decoding tests for HTTP
     //
     http.clearHeader();
-    const char *buffer = "GET 
/software/gnash/tests/flvplayer.swf?file=http://localhost/software/gnash/tests/Ouray_Ice_Festival_Climbing_Competition.flv
 HTTP/1.1\r\n"
+    Network::byte_t *buffer = (Network::byte_t *)"GET 
/software/gnash/tests/flvplayer.swf?file=http://localhost/software/gnash/tests/Ouray_Ice_Festival_Climbing_Competition.flv
 HTTP/1.1\r\n"
 "User-Agent: Gnash/0.8.1-cvs (X11; Linux i686; U; en)\r\n"
 "Host: localhost:4080\r\n"
 "Accept: text/html, application/xml;q=0.9, application/xhtml+xml, image/png, 
image/jpeg, image/gif, image/x-xbitmap, */*;q=0.1\r\n"
@@ -332,7 +333,7 @@
     
 // Some browsers have a different synatax, of course, to keep things
 // interesting.
-    const char *buffer2 = "GET 
/software/gnash/tests/flvplayer.swf?file=http://localhost/software/gnash/tests/Ouray_Ice_Festival_Climbing_Competition.flv
 HTTP/1.1\r\n"
+    Network::byte_t *buffer2 = (Network::byte_t *)"GET 
/software/gnash/tests/flvplayer.swf?file=http://localhost/software/gnash/tests/Ouray_Ice_Festival_Climbing_Competition.flv
 HTTP/1.1\r\n)"
 "Content-Language: en-US,en;q=0.9\r\n"
 "Content-Charset: iso-8859-1, utf-8, utf-16, *;q=0.1\r\n"
 "Content-Encoding: deflate, gzip, x-gzip, identity, *;q=0\r\n";
@@ -378,7 +379,7 @@
         runtest.pass ("HTTP::extractLanguage(Content-)");
     }
 
-    result = http.extractCharset(buffer);
+    result = reinterpret_cast<const char *>(http.extractCharset(buffer));
     std::vector<std::string> charsets = http.getCharset();
     if ((count == 3) &&
         (charsets[0] == "iso-8859-1") &&

Index: http.h
===================================================================
RCS file: /sources/gnash/gnash/cygnal/http.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- http.h      20 Mar 2008 22:19:07 -0000      1.18
+++ http.h      22 Mar 2008 04:05:55 -0000      1.19
@@ -149,8 +149,8 @@
     int extractAccept(gnash::Network::byte_t *data);
     int extractAccept(Buffer *data)
        { return extractAccept(data->reference()); };
-    std::string extractAcceptRanges(gnash::Network::byte_t *data);
-    std::string extractAcceptRanges(Buffer *data)
+    std::string &extractAcceptRanges(gnash::Network::byte_t *data);
+    std::string &extractAcceptRanges(Buffer *data)
        { return extractAcceptRanges(data->reference()); };
     int extractLanguage(gnash::Network::byte_t *data);
     int extractLanguage(Buffer *data)
@@ -172,17 +172,17 @@
        { return extractConnection(data->reference()); };
 
     // These return the string that was found for this field.
-    std::string extractMethod(gnash::Network::byte_t *data);
-    std::string extractMethod(Buffer *data)
+    std::string &extractMethod(gnash::Network::byte_t *data);
+    std::string &extractMethod(Buffer *data)
        { return extractMethod(data->reference()); };
-    std::string extractReferer(gnash::Network::byte_t *data);
-    std::string extractReferer(Buffer *data)
+    std::string &extractReferer(gnash::Network::byte_t *data);
+    std::string &extractReferer(Buffer *data)
        { return extractReferer(data->reference()); };
-    std::string extractHost(gnash::Network::byte_t *data);
-    std::string extractHost(Buffer *data)
+    std::string &extractHost(gnash::Network::byte_t *data);
+    std::string &extractHost(Buffer *data)
        { return extractHost(data->reference()); };
-    std::string extractAgent(gnash::Network::byte_t *data);
-    std::string extractAgent(Buffer *data)
+    std::string &extractAgent(gnash::Network::byte_t *data);
+    std::string &extractAgent(Buffer *data)
        { return extractAgent(data->reference()); };
 
     // These methods add data to the fields in the HTTP header.
@@ -255,6 +255,7 @@
 private:
     std::stringstream _header;
     std::stringstream _body;
+    std::string _command;
     filetype_e  _filetype;
     std::string _filespec;
     int         _filesize;

Index: http.cpp
===================================================================
RCS file: /sources/gnash/gnash/cygnal/http.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- http.cpp    20 Mar 2008 22:19:06 -0000      1.24
+++ http.cpp    22 Mar 2008 04:05:56 -0000      1.25
@@ -681,10 +681,11 @@
         cmd = HTTP::DELETE;
     }
 
+    _command = cmd;
     return cmd;
 }
 
-string
+string &
 HTTP::extractAcceptRanges(Network::byte_t *data) {
 //    GNASH_REPORT_FUNCTION;
     
@@ -693,18 +694,20 @@
     string pattern = "Accept-Ranges: ";
     start = body.find(pattern, 0);
     if (start == string::npos) {
-        return "error";
+        _acceptranges = "error";
+        return _acceptranges;
     }
     end =  body.find("\r\n", start);
     if (end == string::npos) {
-        return "error";
+        _acceptranges = "error";
+        return _acceptranges;
     }
     
     _acceptranges = body.substr(start+pattern.size(), end-start-1);
     return _acceptranges;    
 }
 
-string
+string &
 HTTP::extractMethod(Network::byte_t *data) {
 //    GNASH_REPORT_FUNCTION;
     
@@ -716,22 +719,24 @@
     length = body.size();
     start = body.find(" ", 0);
     if (start == string::npos) {
-        return "error";
+        _method = "error";
+        return _method;
     }
     _method = body.substr(0, start);
     end = body.find(" ", start+1);
     if (end == string::npos) {
-        return "error";
+        _method = "error";
+        return _method;
     }
     _url = body.substr(start+1, end-start-1);
     _version = body.substr(end+1, length);
 
     end = _url.find("?", 0);
 //    _filespec = _url.substr(start+1, end);
-    return "error";
+    return _method;
 }
 
-string 
+string &
 HTTP::extractReferer(Network::byte_t *data) {
 //    GNASH_REPORT_FUNCTION;
     
@@ -741,11 +746,13 @@
     
     start = body.find(pattern, 0);
     if (start == string::npos) {
-        return "error";
+       _referer = "error";
+       return _referer;
     }
     end =  body.find("\r\n", start);
     if (end == string::npos) {
-        return "error";
+       _referer = "error";
+        return _referer;
     }
     
     _referer = body.substr(start+pattern.size(), end-start-1);
@@ -839,7 +846,7 @@
     return _connections.size();
 }
 
-string
+string &
 HTTP::extractHost(Network::byte_t *data) {
 //    GNASH_REPORT_FUNCTION;
     
@@ -849,32 +856,35 @@
     
     start = body.find(pattern, 0);
     if (start == string::npos) {
-        return "error";
+        _host = "error"; 
+        return _host;
     }
     end =  body.find("\r\n", start);
     if (end == string::npos) {
-        return "error";
+        _host = "error"; 
+        return _host;
     }
     
     _host = body.substr(start+pattern.size(), end-start-1);
     return _host;
 }
 
-string 
+string &
 HTTP::extractAgent(Network::byte_t *data) {
 //    GNASH_REPORT_FUNCTION;
     
     string body = reinterpret_cast<const char *>(data);
     string::size_type start, end;
     string pattern = "User-Agent: ";
+    _agent = "error";
     
     start = body.find(pattern, 0);
     if (start == string::npos) {
-        return "error";
+        return _agent;
     }
     end =  body.find("\r\n", start);
     if (end == string::npos) {
-        return "error";
+        return _agent;
     }
     
     _agent = body.substr(start+pattern.size(), end-start-1);

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/cygnal/ChangeLog,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- ChangeLog   20 Mar 2008 22:19:06 -0000      1.13
+++ ChangeLog   22 Mar 2008 04:05:56 -0000      1.14
@@ -1,3 +1,9 @@
+2008-03-21  Rob Savoye  <address@hidden>
+
+       * testsuite/cygnal.all/test_http.cpp: Fix so it compiles
+       again. The API changed to use Network::byte_t instead of uint8_t.
+       * http.{h,cpp}: Return std::string &, not just a reference.
+
 2008-03-20  Rob Savoye  <address@hidden>
 
        * http.{h.cpp}: Add support for RTMPT, which is an extension to
@@ -13,7 +19,7 @@
        statistics 
        * cque.cpp: Set the returned buffer to zero if the mutex has an
        error.
-       * cygnal.cpp: Rn forever, restarting connections after the
+       * cygnal.cpp: Run forever, restarting connections after the
        disconnect.
        * handler.cpp: Trap mutex errors.
        * http.cpp: Tweak the handling of persistant connections.  Add