Log rawio when in debug mode and fixed expiring session exceptions

2 files changed, 4 insertions, 5 deletions

diff --git a/src/logger.cpp b/src/logger.cpp
index 191f977d4..1328e4f57 100644
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -296,7 +296,7 @@ bool LogInfo::HasType(LogType type)
 		case LOG_TERMINAL:
 			return true;
 		case LOG_RAWIO:
-			return this->RawIO;
+			return debug ? true : this->RawIO;
 		case LOG_DEBUG:
 			return debug ? true : this->Debug;
 		// LOG_DEBUG_[234]
diff --git a/src/sessions.cpp b/src/sessions.cpp
index d1b0fcfdd..d9ee39362 100644
--- a/src/sessions.cpp
+++ b/src/sessions.cpp
@@ -200,17 +200,16 @@ void del_session(User *u)
 
 void expire_exceptions()
 {
-	for (std::vector<Exception *>::iterator it = exceptions.begin(), it_end = exceptions.end(); it != it_end; )
+	for (unsigned i = exceptions.size(); i > 0; --i)
 	{
-		Exception *e = *it;
-		std::vector<Exception *>::iterator curr_it = it++;
+		Exception *e = exceptions[i - 1];
 
 		if (!e->expires || e->expires > Anope::CurTime)
 			continue;
 		if (Config->WallExceptionExpire)
 			ircdproto->SendGlobops(OperServ, "Session limit exception for %s has expired.", e->mask.c_str());
 		delete e;
-		exceptions.erase(curr_it);
+		exceptions.erase(exceptions.begin() + i - 1);
 	}
 }