[Gnash-commit] /srv/bzr/gnash/rtmp r9763: Use a 'done' boolean instead of "while(1)".

[rob]

------------------------------------------------------------
revno: 9763
committer: address@hidden
branch nick: rtmp
timestamp: Fri 2008-11-21 09:43:51 -0700
message:
  Use a 'done' boolean instead of "while(1)".
  Close the disk file after loading it into the cache.
modified:
  libnet/http.cpp

=== modified file 'libnet/http.cpp'
--- a/libnet/http.cpp   2008-11-20 03:28:02 +0000
+++ b/libnet/http.cpp   2008-11-21 16:43:51 +0000
@@ -1578,14 +1578,6 @@
            cerr << "FIXME no hit for: " << www.getFilespec() << endl;
            www.clearHeader();
            const stringstream &ss = 
www.formatHeader(filestream->getFileSize(), HTTP::LIFE_IS_GOOD);
-//         cerr << "Size = " << ss.str().size() << "   " << ss.str() << endl;  
-//         string body = ss.str();
-//         cerr << "Body Size = " << body.size() << endl;
-//         body.insert(ss.str().size(), (char *)filestream.get(), 
filestream.getFileSize());
-//         cerr << "Body Size = " << body.size() << endl
-//              << body << endl;
-//     //      cerr << "Size = " << ss.str().size() << "       " << ss.str() 
<< endl;
-//     www.writeNet(args->netfd, (boost::uint8_t *)body.c_str(), body.size());
            www.writeNet(args->netfd, (boost::uint8_t 
*)www.getHeader().c_str(), www.getHeader().size());
            cache.addResponse(www.getFilespec(), www.getHeader());
        } else {
@@ -1622,9 +1614,10 @@
                } while (bytes_read <= filesize);
            } else {
                boost::uint8_t *ptr = filestream->loadChunk(filesize, 0);
+//             filestream->close();
                ret = www.writeNet(args->netfd, filestream->get(), filesize);
            }
-           
+           filestream->close();
 #ifdef USE_STATS_CACHE
            struct timespec end;
            clock_gettime (CLOCK_REALTIME, &end);
@@ -1638,6 +1631,7 @@
        }
        log_debug("http_handler all done transferring requested file...");
 //     cache.dump();
+       done = true;
 
        if (!www.keepAlive()) {
            log_debug("Keep-Alive is off", www.keepAlive());