river at svn
Jul 23, 2008, 3:07 AM
Views: 142
Permalink
|
|
SVN: [37946] trunk/switchboard
|
|
Revision: 37946
Author: river
Date: 2008-07-23 10:07:08 +0000 (Wed, 23 Jul 2008)
Log Message:
-----------
- async_read_fcgi_record: remove cout debugging
- fcgi_socket: writer_ might not exist at this point, assertion failure ensues
switchboard: /opt/boost/include/boost-1_35/boost/shared_ptr.hpp:375: T* boost::shared_ptr<T>::operator->() const [with T = fcgi_record_writer<asio::basic_stream_socket<asio::ip::tcp, asio::stream_socket_service<asio::ip::tcp> > >]: Assertion `px != 0' failed.
Modified Paths:
--------------
trunk/switchboard/async_read_fcgi_record.h
trunk/switchboard/fcgi_socket.h
Modified: trunk/switchboard/async_read_fcgi_record.h
===================================================================
--- trunk/switchboard/async_read_fcgi_record.h 2008-07-23 09:52:39 UTC (rev 37945)
+++ trunk/switchboard/async_read_fcgi_record.h 2008-07-23 10:07:08 UTC (rev 37946)
@@ -119,7 +119,6 @@
std::size_t bytes)
{
if (error == asio::error::operation_aborted) {
- std::cout << "async_fcgi_reader: aborted\n";
service_.post(boost::bind(call_, fcgi::recordp(),
asio::error::operation_aborted));
socket_.reset();
@@ -179,7 +178,6 @@
std::size_t bytes)
{
if (error == asio::error::operation_aborted) {
- std::cout << "async_fcgi_reader: aborted\n";
service_.post(boost::bind(call_, fcgi::recordp(),
asio::error::operation_aborted));
socket_.reset();
Modified: trunk/switchboard/fcgi_socket.h
===================================================================
--- trunk/switchboard/fcgi_socket.h 2008-07-23 09:52:39 UTC (rev 37945)
+++ trunk/switchboard/fcgi_socket.h 2008-07-23 10:07:08 UTC (rev 37946)
@@ -118,7 +118,8 @@
alive_ = false;
close_sig_();
- writer_->close();
+ if (writer_)
+ writer_->close();
writer_.reset();
socket_.close();
}
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS[at]lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
|
SVN: [37946] trunk/switchboard