Remove fflush() + fsync() previously introduced accelerated writing of

server input and response request files of the test harness sws server.

Reintroduce, for test # 1001, the <postcheck> small delay. The delay is
needed even with the accelerated writing of server input and response
request files in test harness sws server.

http://curl.haxx.se/mail/lib-2008-04/0385.html

diff --git a/configure.ac b/configure.ac
index 40e4da61bd38881799af0871bb0d4253c20ef20e..d9ba94ddd2689b9f226b89083492d04e640db2d3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2000,8 +2000,6 @@ AC_CHECK_FUNCS( strtoll \
                 strcasecmp \
                 stricmp \
                 strcmpi \
-                fflush \
-                fsync \
                 gethostbyaddr \
                 gettimeofday \
                 inet_addr \

diff --git a/lib/config-win32.h b/lib/config-win32.h
index 73ac8a08ed8e18cb4ece546f4ee6402c7e25cdd5..031eda54a57f698b9b9b5aa1273f23e3a1cca508 100644 (file)
--- a/lib/config-win32.h
+++ b/lib/config-win32.h
@@ -136,12 +136,6 @@
 /* Define if you don't have vprintf but do have _doprnt.  */
 /* #define HAVE_DOPRNT 1 */
 
-/* Define if you have the fflush function.  */
-#define HAVE_FFLUSH 1
-
-/* Define if you have the fsync function.  */
-/* #define HAVE_FSYNC 1 */
-
 /* Define if you have the gethostbyaddr function.  */
 #define HAVE_GETHOSTBYADDR 1
 

diff --git a/lib/config-win32ce.h b/lib/config-win32ce.h
index 715f1c3e6441c2600be4702a5579194b0e79966e..6c0fb411f632002c4ca35876bebbc5b9e760d376 100644 (file)
--- a/lib/config-win32ce.h
+++ b/lib/config-win32ce.h
@@ -127,14 +127,6 @@
 /* Define if you don't have vprintf but do have _doprnt.  */
 /* #define HAVE_DOPRNT 1 */
 
-/* Define if you have the fflush function.  */
-#if defined(_WIN32_WCE) && (_WIN32_WCE >= 200)
-#  define HAVE_FFLUSH 1
-#endif
-
-/* Define if you have the fsync function.  */
-/* #define HAVE_FSYNC 1 */
-
 /* Define if you have the gethostbyaddr function.  */
 #define HAVE_GETHOSTBYADDR 1
 

diff --git a/src/config-win32.h b/src/config-win32.h
index 92be57479d674e316d4f4caff206940b3807e5ae..6aaac00327bb6cd20b2ebadbc2dac7de49d45173 100644 (file)
--- a/src/config-win32.h
+++ b/src/config-win32.h
@@ -75,12 +75,6 @@
 /* Define if you have the setmode function. */
 #define HAVE_SETMODE 1
 
-/* Define if you have the fflush function.  */
-#define HAVE_FFLUSH 1
-
-/* Define if you have the fsync function.  */
-/* #define HAVE_FSYNC 1 */
-
 /* Define if you have the ftruncate function.  */
 #define HAVE_FTRUNCATE 1
 

diff --git a/tests/data/test1001 b/tests/data/test1001
index 9f8e53432c14faa803cb50d06d8ee666f75857de..58832cbdff6847042e9752825428144f5a8b351e 100644 (file)
--- a/tests/data/test1001
+++ b/tests/data/test1001
@@ -71,6 +71,9 @@ http://%HOSTIP:%HTTPPORT/1001 -u auser:apasswd --digest -T log/1001 -x  http://%
 <file name="log/1001">
 test
 </file>
+<postcheck>
+%SRCDIR/libtest/delay.pl 1
+</postcheck>
 </client>
 
 # Verify data after the test has been "shot"

diff --git a/tests/server/sws.c b/tests/server/sws.c
index b7c9503245a72c2955ff102d2e4d3f5c082a9a2e..41bac4f01c5998d640bc4d15dbeb33b420615189 100644 (file)
--- a/tests/server/sws.c
+++ b/tests/server/sws.c
@@ -512,24 +512,6 @@ void storerequest(char *reqbuf, ssize_t totalsize)
            totalsize-writeleft, totalsize, REQUEST_DUMP);
   }
 
-#ifdef HAVE_FFLUSH
-  do {
-    res = fflush(dump);
-  } while(res && ((error = ERRNO) == EINTR));
-  if(res)
-    logmsg("Error flushing file %s error: %d %s",
-           REQUEST_DUMP, error, strerror(error));
-#endif
-
-#ifdef HAVE_FSYNC
-  do {
-    res = fsync(fileno(dump));
-  } while(res && ((error = ERRNO) == EINTR));
-  if(res)
-    logmsg("Error syncing file %s error: %d %s",
-           REQUEST_DUMP, error, strerror(error));
-#endif
-
   do {
     res = fclose(dump);
   } while(res && ((error = ERRNO) == EINTR));
@@ -800,24 +782,6 @@ static int send_doc(curl_socket_t sock, struct httprequest *req)
     buffer += written;
   } while(count>0);
 
-#ifdef HAVE_FFLUSH
-  do {
-    res = fflush(dump);
-  } while(res && ((error = ERRNO) == EINTR));
-  if(res)
-    logmsg("Error flushing file %s error: %d %s",
-           RESPONSE_DUMP, error, strerror(error));
-#endif
-
-#ifdef HAVE_FSYNC
-  do {
-    res = fsync(fileno(dump));
-  } while(res && ((error = ERRNO) == EINTR));
-  if(res)
-    logmsg("Error syncing file %s error: %d %s",
-           RESPONSE_DUMP, error, strerror(error));
-#endif
-
   do {
     res = fclose(dump);
   } while(res && ((error = ERRNO) == EINTR));