aboutsummaryrefslogtreecommitdiff
path: root/net/spserver
diff options
context:
space:
mode:
authorVanilla I. Shu <vanilla@FreeBSD.org>2009-06-03 03:46:39 +0000
committerVanilla I. Shu <vanilla@FreeBSD.org>2009-06-03 03:46:39 +0000
commit3fbdbd17a0e1c5b8ddb711146d5e4473dfabd5b9 (patch)
tree7b35cfc928755858b8d4d69cea5d5ae455831ae9 /net/spserver
parent6ded0e595cf05005602509c04078cb22cd1a9717 (diff)
downloadports-3fbdbd17a0e1c5b8ddb711146d5e4473dfabd5b9.tar.gz
ports-3fbdbd17a0e1c5b8ddb711146d5e4473dfabd5b9.zip
Notes
Diffstat (limited to 'net/spserver')
-rw-r--r--net/spserver/Makefile2
-rw-r--r--net/spserver/files/patch-speventcb.cpp37
2 files changed, 35 insertions, 4 deletions
diff --git a/net/spserver/Makefile b/net/spserver/Makefile
index e2d747123ea8..b767b78bc2b1 100644
--- a/net/spserver/Makefile
+++ b/net/spserver/Makefile
@@ -7,7 +7,7 @@
PORTNAME= spserver
PORTVERSION= 0.9.4
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DISTNAME= ${PORTNAME}-${PORTVERSION}.src
diff --git a/net/spserver/files/patch-speventcb.cpp b/net/spserver/files/patch-speventcb.cpp
index 72fbaac4c379..806be5a2aa1f 100644
--- a/net/spserver/files/patch-speventcb.cpp
+++ b/net/spserver/files/patch-speventcb.cpp
@@ -1,6 +1,28 @@
---- spserver/speventcb.cpp.orig 2008-05-16 09:41:38.000000000 +0800
-+++ spserver/speventcb.cpp 2008-05-16 09:41:59.000000000 +0800
-@@ -394,7 +394,7 @@
+--- spserver/speventcb.cpp.orig 2008-10-23 22:08:00.000000000 +0800
++++ spserver/speventcb.cpp 2009-06-03 10:20:01.000000000 +0800
+@@ -177,8 +177,10 @@
+ addEvent( session, EV_READ, -1 );
+ } else {
+ int saved = errno;
+- sp_syslog( LOG_NOTICE, "session(%d.%d) read error, errno %d, status %d",
+- sid.mKey, sid.mSeq, errno, session->getStatus() );
++ if( 0 != errno ) {
++ sp_syslog( LOG_WARNING, "session(%d.%d) read error, errno %d, status %d",
++ sid.mKey, sid.mSeq, errno, session->getStatus() );
++ }
+
+ if( EAGAIN != saved ) {
+ if( 0 == session->getRunning() ) {
+@@ -244,7 +246,7 @@
+ if( SP_Session::eExit == session->getStatus() ) {
+ ret = -1;
+ if( 0 == session->getRunning() ) {
+- sp_syslog( LOG_NOTICE, "session(%d.%d) normal exit", sid.mKey, sid.mSeq );
++ sp_syslog( LOG_WARNING, "session(%d.%d) normal exit", sid.mKey, sid.mSeq );
+ SP_EventHelper::doClose( session );
+ } else {
+ addEvent( session, EV_WRITE, -1 );
+@@ -409,7 +411,7 @@
char buffer[ 16 ] = { 0 };
session->getInBuffer()->take( buffer, sizeof( buffer ) );
sp_syslog( LOG_WARNING, "session(%d.%d) status is %d, ignore [%s...] (%dB)",
@@ -9,3 +31,12 @@
session->getInBuffer()->reset();
}
}
+@@ -553,7 +555,7 @@
+ SP_EventArg * eventArg = (SP_EventArg*)session->getArg();
+ SP_Sid_t sid = session->getSid();
+
+- sp_syslog( LOG_NOTICE, "session(%d.%d) close, r %d(%d), w %d(%d), i %d, o %d, s %d(%d)",
++ sp_syslog( LOG_WARNING, "session(%d.%d) close, r %d(%d), w %d(%d), i %d, o %d, s %d(%d)",
+ sid.mKey, sid.mSeq, session->getTotalRead(), session->getReading(),
+ session->getTotalWrite(), session->getWriting(),
+ session->getInBuffer()->getSize(), session->getOutList()->getCount(),