Update of /cvsroot/sblim/sfcb
In directory vz-cvs-3.sog:/tmp/cvs-serv2012
Modified Files:
ChangeLog NEWS httpAdapter.c sfcBroker.c
Log Message:
3492362 Problem with whitespace trimming if local connect only
Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/sfcb/NEWS,v
retrieving revision 1.637
retrieving revision 1.638
diff -u -d -r1.637 -r1.638
--- NEWS 17 Feb 2012 22:54:59 -0000 1.637
+++ NEWS 23 Feb 2012 21:25:25 -0000 1.638
@@ -29,6 +29,7 @@
- 3485830 SFCB Makes Redundant ActivateFilter Calls
- 3487419 TestIndication Provider Does Enable Correctly
- 3487675 Log messages can be concatenated
+- 3492362 Problem with whitespace trimming if local connect only
Changes in 1.3.13
=================
Index: sfcBroker.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/sfcBroker.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- sfcBroker.c 17 Feb 2012 22:54:59 -0000 1.60
+++ sfcBroker.c 23 Feb 2012 21:25:25 -0000 1.61
@@ -98,6 +98,8 @@
static int restartArgc;
static int adaptersStopped=0,providersStopped=0,restartBroker=0;
+int trimws=1;
+
extern char * configfile;
typedef struct startedAdapter {
@@ -774,6 +776,11 @@
"--- Max provider process number adjusted to %d\n", pSockets);
}
+ // Check for whitespace trimming option
+ if (getControlBool("trimWhitespace", &trimws)) {
+ trimws = 0;
+ }
+
if ((enableHttp || enableHttps) && dSockets > 0) {
startHttp = 1;
}
Index: httpAdapter.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/httpAdapter.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- httpAdapter.c 23 Nov 2011 03:24:00 -0000 1.96
+++ httpAdapter.c 23 Feb 2012 21:25:25 -0000 1.97
@@ -90,7 +90,6 @@
static long numRequest;
static long selectTimeout = 5; /* default 5 sec. timeout for select() before read() */
struct timeval httpSelectTimeout = {0, 0};
-int trimws;
#if defined USE_SSL
static SSL_CTX *ctx;
@@ -1621,9 +1620,6 @@
noChunking = 0;
noChunking = noChunking == 0;
- if (getControlBool("trimWhitespace", &trimws))
- trimws = 0;
-
/*
* grab commandline options
*/
Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/sfcb/ChangeLog,v
retrieving revision 1.714
retrieving revision 1.715
diff -u -d -r1.714 -r1.715
--- ChangeLog 17 Feb 2012 22:54:59 -0000 1.714
+++ ChangeLog 23 Feb 2012 21:25:24 -0000 1.715
@@ -1,3 +1,8 @@
+2012-02-23 Michael Chase-Salerno <br...@li...>
+
+ * httpAdapter.c, sfcBroker.c:
+ [ 3492362 ] Problem with whitespace trimming if local connect only
+
2012-02-17 Michael Chase-Salerno <br...@li...>
* mlog.c, mlog.h, cimcClientSfcbLocal.c,
|
