platform/upstream/curl.git
14 years agoprogress callback called repeatedly during slow connects
Daniel Stenberg [Mon, 11 Jan 2010 21:38:35 +0000 (21:38 +0000)]
progress callback called repeatedly during slow connects

14 years ago- Made sure that the progress callback is repeatedly called at a regular
Daniel Stenberg [Mon, 11 Jan 2010 21:38:13 +0000 (21:38 +0000)]
- Made sure that the progress callback is repeatedly called at a regular
  interval even during very slow connects.

14 years ago- The tests/runtests.pl script now checks to see if the test case that runs is
Daniel Stenberg [Mon, 11 Jan 2010 15:50:30 +0000 (15:50 +0000)]
- The tests/runtests.pl script now checks to see if the test case that runs is
  present in the tests/data/Makefile.am and outputs a notice message on the
  screen if not. Each test file has to be included in that Makefile.am to get
  included in release archives and forgetting to add files there is a common
  mistake. This is an attempt to make it harder to forget.

14 years agosecureserver.pl is now the test harness script used for SSL/TLS.
Yang Tse [Mon, 11 Jan 2010 04:51:14 +0000 (04:51 +0000)]
secureserver.pl is now the test harness script used for SSL/TLS.

14 years agosecureserver.pl is now the test harness script used for SSL/TLS.
Yang Tse [Mon, 11 Jan 2010 04:49:13 +0000 (04:49 +0000)]
secureserver.pl is now the test harness script used for SSL/TLS.

Start using the centralized pidfile and logfile name generation
subroutines for https and ftps test suite servers.

14 years agoUpdate error message to include port number
Yang Tse [Sun, 10 Jan 2010 04:24:46 +0000 (04:24 +0000)]
Update error message to include port number

14 years agoPrevious commit adjustments
Yang Tse [Sun, 10 Jan 2010 02:41:44 +0000 (02:41 +0000)]
Previous commit adjustments

14 years agoStart using the centralized pidfile and logfile name generation
Yang Tse [Sat, 9 Jan 2010 18:35:59 +0000 (18:35 +0000)]
Start using the centralized pidfile and logfile name generation
subroutines for ftp, pop3, imap and smtp test suite servers.

14 years agostruct Curl_sh_entry's 'inuse' member was no longer used and is now removed
Daniel Stenberg [Sat, 9 Jan 2010 00:03:33 +0000 (00:03 +0000)]
struct Curl_sh_entry's 'inuse' member was no longer used and is now removed

14 years ago- Johan van Selst found and fixed a OpenSSL session ref count leak:
Daniel Stenberg [Fri, 8 Jan 2010 23:45:23 +0000 (23:45 +0000)]
- Johan van Selst found and fixed a OpenSSL session ref count leak:

  ossl_connect_step3() increments an SSL session handle reference counter on
  each call. When sessions are re-used this reference counter may be
  incremented many times, but it will be decremented only once when done (by
  Curl_ossl_session_free()); and the internal OpenSSL data will not be freed
  if this reference count remains positive. When a session is re-used the
  reference counter should be corrected by explicitly calling
  SSL_SESSION_free() after each consecutive SSL_get1_session() to avoid
  introducing a memory leak.

  (http://curl.haxx.se/bug/view.cgi?id=2926284)

14 years agoStart using the centralized pidfile and logfile name generation
Yang Tse [Fri, 8 Jan 2010 15:54:07 +0000 (15:54 +0000)]
Start using the centralized pidfile and logfile name generation
subroutines for http and tftp test suite servers.

14 years agoRemove extra line feed
Yang Tse [Fri, 8 Jan 2010 12:01:35 +0000 (12:01 +0000)]
Remove extra line feed

14 years agoUse '_stunnel.log' ending also for https test server log
Yang Tse [Fri, 8 Jan 2010 01:54:29 +0000 (01:54 +0000)]
Use '_stunnel.log' ending also for https test server log

14 years agosws and tftpd command line option naming adjustments
Yang Tse [Fri, 8 Jan 2010 01:48:54 +0000 (01:48 +0000)]
sws and tftpd command line option naming adjustments

14 years agoremoved a parameter from the Curl_http_readwrite_headers() prototype to remove
Daniel Stenberg [Thu, 7 Jan 2010 22:48:28 +0000 (22:48 +0000)]
removed a parameter from the Curl_http_readwrite_headers() prototype to remove
the need for the struct forward declaration from http.h which caused problems
with gcc 2.96 and quite frankly the parameter wasn't necessary anyway

14 years agoList fragment tests in Makefile.am and better provide better names
Claes Jakobsson [Thu, 7 Jan 2010 14:44:04 +0000 (14:44 +0000)]
List fragment tests in Makefile.am and better provide better names

14 years agoremoved Curl_http_header_append() prototype as it isn't used anymore, the
Daniel Stenberg [Thu, 7 Jan 2010 14:02:05 +0000 (14:02 +0000)]
removed Curl_http_header_append() prototype as it isn't used anymore, the
function was moved to http.c and was made static and renamed

14 years ago- Make sure the progress callback is called repeatedly even during very slow
Daniel Stenberg [Wed, 6 Jan 2010 23:04:17 +0000 (23:04 +0000)]
- Make sure the progress callback is called repeatedly even during very slow
  name resolves when c-ares is used for resolving.

14 years agoDisable tests 802 and 803
Yang Tse [Wed, 6 Jan 2010 18:28:15 +0000 (18:28 +0000)]
Disable tests 802 and 803

14 years agoPrevent detection of stdint.h on IRIX systems, even when available.
Yang Tse [Wed, 6 Jan 2010 18:25:10 +0000 (18:25 +0000)]
Prevent detection of stdint.h on IRIX systems, even when available.

IRIX MIPSpro 7.4 C++ compiler does not tolerate inclusion of stdint.h

14 years agoJulien Chaffraix fixed so that the fragment part in an URL is not sent to the server...
Claes Jakobsson [Wed, 6 Jan 2010 16:01:48 +0000 (16:01 +0000)]
Julien Chaffraix fixed so that the fragment part in an URL is not sent to the server anymore

14 years agouse the modern name for this option
Daniel Stenberg [Mon, 4 Jan 2010 18:43:29 +0000 (18:43 +0000)]
use the modern name for this option

14 years ago- Julien Chaffraix eliminated a duplicated initialization in singlesocket().
Kamil Dudka [Sun, 3 Jan 2010 13:46:37 +0000 (13:46 +0000)]
- Julien Chaffraix eliminated a duplicated initialization in singlesocket().

14 years ago- Make curl support --ssl and --ssl-reqd instead of the previous FTP-specific
Daniel Stenberg [Sat, 2 Jan 2010 22:09:31 +0000 (22:09 +0000)]
- Make curl support --ssl and --ssl-reqd instead of the previous FTP-specific
  versions --ftp-ssl and --ftp-ssl-reqd as these options are now used to
  control SSL/TLS for IMAP, POP3 and SMTP as well in addition to FTP. The old
  option names are still working but the new ones are the prefered ones
  (listed and documented).

14 years agostop at once if the EOB marker shows up, even if something else might get
Daniel Stenberg [Fri, 1 Jan 2010 19:49:44 +0000 (19:49 +0000)]
stop at once if the EOB marker shows up, even if something else might get
sent afterwards

14 years agoupdate copyright year since we are in 2010 now
Daniel Stenberg [Fri, 1 Jan 2010 14:52:50 +0000 (14:52 +0000)]
update copyright year since we are in 2010 now

14 years agoadded CURLOPT_FTP_USE_PRET
Daniel Stenberg [Fri, 1 Jan 2010 14:52:12 +0000 (14:52 +0000)]
added CURLOPT_FTP_USE_PRET

14 years ago- Ingmar Runge enhanced libcurl's FTP engine to support the PRET command. This
Daniel Stenberg [Fri, 1 Jan 2010 14:44:44 +0000 (14:44 +0000)]
- Ingmar Runge enhanced libcurl's FTP engine to support the PRET command. This
  command is a special "hack" used by the drftpd server, but even though it is
  a custom extension I've deemed it fine to add to libcurl since this server
  seems to survive and people keep using it and want libcurl to support
  it. The new libcurl option is named CURLOPT_FTP_USE_PRET, and it is also
  usable from the curl tool with --ftp-pret. Using this option on a server
  that doesn't support this command will make libcurl fail.

14 years agoadded descriptions for CURLOPT_MAIL_FROM and CURLOPT_MAIL_RCPT
Daniel Stenberg [Thu, 31 Dec 2009 22:38:10 +0000 (22:38 +0000)]
added descriptions for CURLOPT_MAIL_FROM and CURLOPT_MAIL_RCPT

14 years ago--mail-rcpt and --mail-from are starting to settle and work like this...
Daniel Stenberg [Thu, 31 Dec 2009 21:59:50 +0000 (21:59 +0000)]
--mail-rcpt and --mail-from are starting to settle and work like this...

14 years agoturned CURLOPT_MAIL_RCPT into a curl_slist list instead to support multiple
Daniel Stenberg [Thu, 31 Dec 2009 21:52:01 +0000 (21:52 +0000)]
turned CURLOPT_MAIL_RCPT into a curl_slist list instead to support multiple
receivers, and made the command line tool thus support the option specified
many times

14 years agoUse '_stunnel.log' file name ending for stunneled server logs
Yang Tse [Thu, 31 Dec 2009 15:26:16 +0000 (15:26 +0000)]
Use '_stunnel.log' file name ending for stunneled server logs

14 years agoVMS adjustments by Steven M. Schweda
Yang Tse [Thu, 31 Dec 2009 13:35:24 +0000 (13:35 +0000)]
VMS adjustments by Steven M. Schweda

14 years agoSubs for refactoring purposes
Yang Tse [Thu, 31 Dec 2009 02:29:55 +0000 (02:29 +0000)]
Subs for refactoring purposes

14 years agoCURLOPT_HEADERDATA was added in 7.10
Daniel Stenberg [Wed, 30 Dec 2009 23:14:30 +0000 (23:14 +0000)]
CURLOPT_HEADERDATA was added in 7.10

14 years agos/CURLOPT_WRITEHEADER/CURLOPT_HEADERDATA simply because it is a better name
Daniel Stenberg [Wed, 30 Dec 2009 23:14:00 +0000 (23:14 +0000)]
s/CURLOPT_WRITEHEADER/CURLOPT_HEADERDATA simply because it is a better name

14 years agomodified to get the EHLO domain from the path part of the URL instead of the
Daniel Stenberg [Wed, 30 Dec 2009 22:50:42 +0000 (22:50 +0000)]
modified to get the EHLO domain from the path part of the URL instead of the
user name

14 years agomoved the SMTP payload escape function into Curl_smtp_escape_eob and put
Daniel Stenberg [Wed, 30 Dec 2009 22:09:43 +0000 (22:09 +0000)]
moved the SMTP payload escape function into Curl_smtp_escape_eob and put
it in smtp.c

14 years ago(SMTP) support DATA better in the server and make sure to "escape" CRLF.CRLF
Daniel Stenberg [Wed, 30 Dec 2009 21:52:27 +0000 (21:52 +0000)]
(SMTP) support DATA better in the server and make sure to "escape" CRLF.CRLF
sequences in uploaded data. The test server doesn't "decode" escaped dot-lines
but instead test cases must be written to take them into account. Added test
case 803 to verify dot-escaping.

14 years agoOops, should have removed 'not' in previous commit.
Yang Tse [Wed, 30 Dec 2009 19:43:12 +0000 (19:43 +0000)]
Oops, should have removed 'not' in previous commit.

14 years agoVMS build system enhancements by Steven M. Schweda and Craig A. Berry
Yang Tse [Wed, 30 Dec 2009 19:37:53 +0000 (19:37 +0000)]
VMS build system enhancements by Steven M. Schweda and Craig A. Berry

14 years agoVMS specific preprocessor symbol checking adjustments
Yang Tse [Wed, 30 Dec 2009 17:59:56 +0000 (17:59 +0000)]
VMS specific preprocessor symbol checking adjustments

14 years agoVMS specific preprocessor symbol definition adjustments
Yang Tse [Wed, 30 Dec 2009 17:59:10 +0000 (17:59 +0000)]
VMS specific preprocessor symbol definition adjustments

14 years agoReplaced stricmp() usage with our portable strequal()
Yang Tse [Wed, 30 Dec 2009 15:47:23 +0000 (15:47 +0000)]
Replaced stricmp() usage with our portable strequal()

14 years agomove HTTP-specific functions to http.c where they belong
Daniel Stenberg [Tue, 29 Dec 2009 21:45:02 +0000 (21:45 +0000)]
move HTTP-specific functions to http.c where they belong

14 years agotest 802 is the first SMTP test, although not strictly SMTP yet...
Daniel Stenberg [Tue, 29 Dec 2009 21:28:53 +0000 (21:28 +0000)]
test 802 is the first SMTP test, although not strictly SMTP yet...

14 years agoMention last changes
Yang Tse [Tue, 29 Dec 2009 02:32:12 +0000 (02:32 +0000)]
Mention last changes

14 years ago- Fix configure_socket() to use ares_socket_t instead of int data type.
Yang Tse [Tue, 29 Dec 2009 02:04:17 +0000 (02:04 +0000)]
- Fix configure_socket() to use ares_socket_t instead of int data type.

14 years ago- Where run-time error checks enabling compiler option /GZ was used it is now
Yang Tse [Tue, 29 Dec 2009 01:51:57 +0000 (01:51 +0000)]
- Where run-time error checks enabling compiler option /GZ was used it is now
  replaced with equivalent /RTCsu for Visual Studio 2003 and newer versions.

- Compiler option /GX is now replaced with equivalent /EHsc for all versions.

14 years agoLeftover from previous commit
Yang Tse [Mon, 28 Dec 2009 20:10:00 +0000 (20:10 +0000)]
Leftover from previous commit

14 years agoInitial refactoring step for server name strings centralized generation
Yang Tse [Mon, 28 Dec 2009 20:00:41 +0000 (20:00 +0000)]
Initial refactoring step for server name strings centralized generation

14 years agoJulien Chaffraix's clarifications
Daniel Stenberg [Sun, 27 Dec 2009 20:54:26 +0000 (20:54 +0000)]
Julien Chaffraix's clarifications

14 years agoAdjust FreeBSD version check to follow FreeBSD Porter's Handbook
Yang Tse [Sun, 27 Dec 2009 02:31:29 +0000 (02:31 +0000)]
Adjust FreeBSD version check to follow FreeBSD Porter's Handbook

http://www.freebsd.org/doc/en/books/porters-handbook/porting-versions.html

14 years agosymbols added in the CVS version meant for 7.20.0
Daniel Stenberg [Sat, 26 Dec 2009 18:42:25 +0000 (18:42 +0000)]
symbols added in the CVS version meant for 7.20.0

14 years agoglobal variables reordering/refactoring/commenting
Yang Tse [Sat, 26 Dec 2009 18:32:19 +0000 (18:32 +0000)]
global variables reordering/refactoring/commenting

14 years agoadd pointer to the bug report
Daniel Stenberg [Fri, 25 Dec 2009 23:35:16 +0000 (23:35 +0000)]
add pointer to the bug report

14 years ago- Renato Botelho and Peter Pentchev brought a patch that makes the libcurl
Daniel Stenberg [Fri, 25 Dec 2009 23:32:01 +0000 (23:32 +0000)]
- Renato Botelho and Peter Pentchev brought a patch that makes the libcurl
  headers work correctly even on FreeBSD systems before v8.

14 years agofirst shot at actually doing the SMTP upload as well, not doing the proper
Daniel Stenberg [Fri, 25 Dec 2009 22:50:11 +0000 (22:50 +0000)]
first shot at actually doing the SMTP upload as well, not doing the proper
end-of-body treatment

14 years agoWhen verifying the SMTP server I had to add some hackery since SMTP in itself
Daniel Stenberg [Fri, 25 Dec 2009 22:21:46 +0000 (22:21 +0000)]
When verifying the SMTP server I had to add some hackery since SMTP in itself
doesn't really return any body data to check so I made SMTP check "headers"
as well.

14 years agofirst basic SMTP support
Daniel Stenberg [Fri, 25 Dec 2009 22:20:37 +0000 (22:20 +0000)]
first basic SMTP support

14 years agoAdjust test number mismatch
Yang Tse [Thu, 24 Dec 2009 12:04:33 +0000 (12:04 +0000)]
Adjust test number mismatch

14 years agoEnable warnings
Yang Tse [Thu, 24 Dec 2009 12:01:53 +0000 (12:01 +0000)]
Enable warnings

14 years agoFix warnings
Yang Tse [Thu, 24 Dec 2009 12:00:43 +0000 (12:00 +0000)]
Fix warnings

14 years agoFix warnings
Yang Tse [Wed, 23 Dec 2009 18:46:55 +0000 (18:46 +0000)]
Fix warnings

14 years agoBack out some pingpong server stopping changes introduced last week in
Yang Tse [Wed, 23 Dec 2009 15:20:20 +0000 (15:20 +0000)]
Back out some pingpong server stopping changes introduced last week in
order to re-use 'classic' stopping and allow taking test-suite run time
references from this state.

14 years agouse Time::HiRes whenever available, independently of perl version
Yang Tse [Tue, 22 Dec 2009 13:46:06 +0000 (13:46 +0000)]
use Time::HiRes whenever available, independently of perl version

14 years agolog a message when continuing once sleep time is over
Yang Tse [Tue, 22 Dec 2009 13:45:01 +0000 (13:45 +0000)]
log a message when continuing once sleep time is over

14 years ago- Ingmar Runge noticed that Windows config-win32.h configuration file
Yang Tse [Mon, 21 Dec 2009 16:55:39 +0000 (16:55 +0000)]
- Ingmar Runge noticed that Windows config-win32.h configuration file
  did not include a definition for HAVE_CLOSESOCKET which resulted in
  function close() being inappropriately used to close sockets.

14 years agoMake 'classic' output end of a test-suite run become again the end
Yang Tse [Mon, 21 Dec 2009 15:50:24 +0000 (15:50 +0000)]
Make 'classic' output end of a test-suite run become again the end
of output, even when run time statistics are shown.

14 years agoMove stopping of servers instructed by test definition, after the removal of
Yang Tse [Mon, 21 Dec 2009 14:53:07 +0000 (14:53 +0000)]
Move stopping of servers instructed by test definition, after the removal of
server logs advisor read lock and before test results verifications are done.

When stopping a pingpong server, stop server before its slaves.

14 years agotest 566 was missing
Daniel Stenberg [Mon, 21 Dec 2009 14:51:07 +0000 (14:51 +0000)]
test 566 was missing

14 years agodead_child_handler also takes care of reaping pingpong server dead child processes
Yang Tse [Mon, 21 Dec 2009 14:43:29 +0000 (14:43 +0000)]
dead_child_handler also takes care of reaping pingpong server dead child processes

14 years agoReap processes dead children ASAP without blocking
Yang Tse [Mon, 21 Dec 2009 14:36:01 +0000 (14:36 +0000)]
Reap processes dead children ASAP without blocking

14 years agoReinstate hi resolution time logging since this is not what is
Yang Tse [Mon, 21 Dec 2009 14:33:01 +0000 (14:33 +0000)]
Reinstate hi resolution time logging since this is not what is
now adding 90 extra seconds to the total time some autobuilds
need to make a full test-run.

14 years agoTake new SMTP definitions into account in OS400 wrapper and RPG binding
Patrick Monnerat [Mon, 21 Dec 2009 12:26:48 +0000 (12:26 +0000)]
Take new SMTP definitions into account in OS400 wrapper and RPG binding

14 years agofirst small steps towards smtp
Daniel Stenberg [Mon, 21 Dec 2009 08:33:47 +0000 (08:33 +0000)]
first small steps towards smtp

14 years agoReplaced tabs with spaces
Yang Tse [Mon, 21 Dec 2009 02:37:23 +0000 (02:37 +0000)]
Replaced tabs with spaces

14 years agoremove some unused code
Daniel Stenberg [Sun, 20 Dec 2009 22:11:16 +0000 (22:11 +0000)]
remove some unused code

14 years agoImprove delay command interruptability
Yang Tse [Sun, 20 Dec 2009 22:09:53 +0000 (22:09 +0000)]
Improve delay command interruptability

14 years agorevert that, we already had a function named like that!
Daniel Stenberg [Sun, 20 Dec 2009 22:08:06 +0000 (22:08 +0000)]
revert that, we already had a function named like that!

14 years agorename the verifyftp function to verifyserver since it is used to verify
Daniel Stenberg [Sun, 20 Dec 2009 22:00:23 +0000 (22:00 +0000)]
rename the verifyftp function to verifyserver since it is used to verify
a wide variety of protocol servers

14 years agofree the allocated mailbox name at disconnect
Daniel Stenberg [Sun, 20 Dec 2009 11:10:08 +0000 (11:10 +0000)]
free the allocated mailbox name at disconnect

14 years agointroducing the first IMAP FETCH test
Daniel Stenberg [Sun, 20 Dec 2009 11:07:04 +0000 (11:07 +0000)]
introducing the first IMAP FETCH test

14 years ago- Attempt to fix script compilation failure on versions older than 5.007003,
Yang Tse [Sun, 20 Dec 2009 03:48:32 +0000 (03:48 +0000)]
- Attempt to fix script compilation failure on versions older than 5.007003,
  corelist -a Time::HiRes lists this as the first version released with it.

- Ensure ftp check delay timer is always an integral number.

14 years agosupport IMAP select and LOGOUT
Daniel Stenberg [Sat, 19 Dec 2009 23:23:26 +0000 (23:23 +0000)]
support IMAP select and LOGOUT

14 years agofix the ftp check delay timer to never be set below 1 to work correctly
Daniel Stenberg [Sat, 19 Dec 2009 23:10:33 +0000 (23:10 +0000)]
fix the ftp check delay timer to never be set below 1 to work correctly
in cases like test 190

14 years agofixed a precaution check in the cookie code, pointed out by Julien Chaffraix
Daniel Stenberg [Sat, 19 Dec 2009 19:20:26 +0000 (19:20 +0000)]
fixed a precaution check in the cookie code, pointed out by Julien Chaffraix

14 years agoSlack time reduction
Yang Tse [Sat, 19 Dec 2009 13:20:07 +0000 (13:20 +0000)]
Slack time reduction

14 years agoAdded runtests.pl '-r' option for run time statistics
Yang Tse [Sat, 19 Dec 2009 04:15:22 +0000 (04:15 +0000)]
Added runtests.pl '-r' option for run time statistics

14 years agoserver start and verification time as well as test preparation time
Yang Tse [Fri, 18 Dec 2009 19:17:14 +0000 (19:17 +0000)]
server start and verification time as well as test preparation time
data is required in order to closer match total test execution time.

14 years agoAdded test harness simple time execution stats
Yang Tse [Fri, 18 Dec 2009 15:23:18 +0000 (15:23 +0000)]
Added test harness simple time execution stats

14 years agoComment out hi resolution time logging to verify if this is what might
Yang Tse [Thu, 17 Dec 2009 22:28:40 +0000 (22:28 +0000)]
Comment out hi resolution time logging to verify if this is what might
be contributing 90 additional seconds to the total time some autobuilds
now need to make a full test-run.

14 years agoFix compilation failure
Yang Tse [Thu, 17 Dec 2009 20:01:24 +0000 (20:01 +0000)]
Fix compilation failure

14 years agoTest harness process control enhancements
Yang Tse [Thu, 17 Dec 2009 19:37:01 +0000 (19:37 +0000)]
Test harness process control enhancements

14 years agouh, assign the bool it points to properly
Daniel Stenberg [Thu, 17 Dec 2009 16:07:02 +0000 (16:07 +0000)]
uh, assign the bool it points to properly

14 years agoStop overloading the conn->protocol field with the PROT_MISSING bit. It
Daniel Stenberg [Thu, 17 Dec 2009 16:03:39 +0000 (16:03 +0000)]
Stop overloading the conn->protocol field with the PROT_MISSING bit. It
really didn't belong there and had no real point.

14 years agoRemove pointless storing of the protocol as a string within the connectdata
Daniel Stenberg [Thu, 17 Dec 2009 15:45:04 +0000 (15:45 +0000)]
Remove pointless storing of the protocol as a string within the connectdata
struct, and instead use the already stored string in the handler struct.

14 years ago- David Byron fixed Curl_ossl_cleanup to actually call ENGINE_cleanup when
Daniel Stenberg [Thu, 17 Dec 2009 13:29:41 +0000 (13:29 +0000)]
- David Byron fixed Curl_ossl_cleanup to actually call ENGINE_cleanup when
  available.

14 years agogettimeofday() requires perl version newer than 5.6
Yang Tse [Thu, 17 Dec 2009 03:50:32 +0000 (03:50 +0000)]
gettimeofday() requires perl version newer than 5.6

14 years agoFollow-up fix for the proxy fix I did for Jon Nelson's bug. It turned out I
Daniel Stenberg [Wed, 16 Dec 2009 23:11:47 +0000 (23:11 +0000)]
Follow-up fix for the proxy fix I did for Jon Nelson's bug. It turned out I
was a bit too quick and broke test case 1101 with that change. The order of
some of the setups is sensitive. I now changed it slightly again.