|
From: Chris B. <buc...@us...> - 2012-03-30 02:33:46
|
Update of /cvsroot/sblim/sfcb
In directory vz-cvs-3.sog:/tmp/cvs-serv15960
Modified Files:
httpAdapter.c ChangeLog NEWS contributions.txt
Log Message:
[ 3441028 ] sblim-sfcb fails on large https requests
Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/sfcb/NEWS,v
retrieving revision 1.672
retrieving revision 1.673
diff -u -d -r1.672 -r1.673
--- NEWS 29 Mar 2012 21:19:43 -0000 1.672
+++ NEWS 30 Mar 2012 02:33:43 -0000 1.673
@@ -63,6 +63,7 @@
- 3510456 GetProperty calls not passing keys to providers
- 3505407 Client openlog changes settings
- 3408288 Safer Signal Handlers
+- 3441028 sblim-sfcb fails on large https requests
Changes in 1.3.13
=================
Index: httpAdapter.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/httpAdapter.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- httpAdapter.c 13 Mar 2012 15:10:49 -0000 1.102
+++ httpAdapter.c 30 Mar 2012 02:33:43 -0000 1.103
@@ -404,7 +404,13 @@
FD_SET(conn_fd.socket,&httpfds);
while (c < length) {
- isReady = select(conn_fd.socket+1,&httpfds,NULL,NULL,&httpSelectTimeout);
+#ifdef USE_SSL
+ if (conn_fd.ssl && SSL_pending(conn_fd.ssl))
+ isReady = 1;
+ else
+#endif
+ isReady = select(conn_fd.socket+1,&httpfds,NULL,NULL,&httpSelectTimeout);
+
if (isReady == 0) {
c = -1;
break;
Index: contributions.txt
===================================================================
RCS file: /cvsroot/sblim/sfcb/contributions.txt,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- contributions.txt 28 Mar 2012 15:48:12 -0000 1.71
+++ contributions.txt 30 Mar 2012 02:33:43 -0000 1.72
@@ -114,6 +114,7 @@
06/30/2010 [ 2968599 ] Wrong trace msg for invokeMethod (local interface)
06/09/2011 [ 3047562 ] [patch] Create bzip2 tarballs on "make dist"
09/30/2011 [ 3416055 ] SIGSEGV sometimes does not print provider name
+03/29/2012 [ 3441028 ] sblim-sfcb fails on large https requests
Mike Brasher, Inova
-------------------
Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/sfcb/ChangeLog,v
retrieving revision 1.751
retrieving revision 1.752
diff -u -d -r1.751 -r1.752
--- ChangeLog 29 Mar 2012 21:19:43 -0000 1.751
+++ ChangeLog 30 Mar 2012 02:33:43 -0000 1.752
@@ -1,5 +1,9 @@
2012-03-29 Chris Buccella <buc...@li...>
+ * httpAdapter.c:
+ [ 3441028 ] sblim-sfcb fails on large https requests
+ (patch by Klaus Kaempf)
+
* providerDrv.c:
[ 3408288 ] Safer Signal Handlers
|