[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog libnet/cque.cpp libnet/http.cpp
From: |
Rob Savoye |
Subject: |
[Gnash-commit] gnash ChangeLog libnet/cque.cpp libnet/http.cpp |
Date: |
Mon, 07 Apr 2008 14:16:52 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Rob Savoye <rsavoye> 08/04/07 14:16:52
Modified files:
. : ChangeLog
libnet : cque.cpp http.cpp
Log message:
* libnet/cque.cpp: Enable ifdef'd out deletion of buffers from
the
cque at destuction time.
* libnet/http.cpp: Don't forget to pass in the filetype.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6201&r2=1.6202
http://cvs.savannah.gnu.org/viewcvs/gnash/libnet/cque.cpp?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/libnet/http.cpp?cvsroot=gnash&r1=1.6&r2=1.7
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6201
retrieving revision 1.6202
diff -u -b -r1.6201 -r1.6202
--- ChangeLog 7 Apr 2008 13:14:54 -0000 1.6201
+++ ChangeLog 7 Apr 2008 14:16:49 -0000 1.6202
@@ -1,3 +1,9 @@
+2008-04-07 Rob Savoye <address@hidden>
+
+ * libnet/cque.cpp: Enable ifdef'd out deletion of buffers from the
+ cque at destuction time.
+ * libnet/http.cpp: Don't forget to pass in the filetype.
+
2008-04-07 Benjamin Wolsey <address@hidden>
* testsuite/actionscript.all: drop more tests that are dependent on
Index: libnet/cque.cpp
===================================================================
RCS file: /sources/gnash/gnash/libnet/cque.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- libnet/cque.cpp 6 Apr 2008 18:11:34 -0000 1.9
+++ libnet/cque.cpp 7 Apr 2008 14:16:51 -0000 1.10
@@ -53,14 +53,12 @@
{
// GNASH_REPORT_FUNCTION;
// clear();
-#if 0
- deque<amf::Buffer *>::iterator it;
+ Que::iterator it;
boost::mutex::scoped_lock lock(_mutex);
for (it = _que.begin(); it != _que.end(); it++) {
amf::Buffer *ptr = *(it);
delete ptr;
}
-#endif
}
// Wait for a condition variable to trigger
Index: libnet/http.cpp
===================================================================
RCS file: /sources/gnash/gnash/libnet/http.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- libnet/http.cpp 1 Apr 2008 22:20:37 -0000 1.6
+++ libnet/http.cpp 7 Apr 2008 14:16:51 -0000 1.7
@@ -58,7 +58,8 @@
static const int readsize = 1024;
HTTP::HTTP()
- : _filesize(0),
+ : _filetype(amf::AMF::FILETYPE_HTML),
+ _filesize(0),
_port(80),
_keepalive(true),
_handler(0),
@@ -72,7 +73,10 @@
}
HTTP::HTTP(Handler *hand)
- : _filesize(0), _port(80), _keepalive(false)
+ : _filetype(amf::AMF::FILETYPE_HTML),
+ _filesize(0),
+ _port(80),
+ _keepalive(false)
{
// GNASH_REPORT_FUNCTION;
_handler = hand;
@@ -185,7 +189,7 @@
formatContentLength(filesize);
formatKeepAlive("timeout=15, max=100");
formatConnection("Keep-Alive");
- formatContentType();
+ formatContentType(amf::AMF::FILETYPE_HTML);
// All HTTP messages are followed by a blank line.
terminateHeader();
return true;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog libnet/cque.cpp libnet/http.cpp,
Rob Savoye <=