Am 02.02.2014 11:43, schrieb Steve Holme: > > Just a quick email from FOSDEM so I will take a look at this email and your > patches in further detail later... but have you noticed that on LF based > systems that test 1316 is now failing [1], so I just wanted to let you know > in case you're not already aware of it ;-)
Thanks for the notice, I unfortunately didn't check those small (compared to the patches) changes to the testsuite on LF-based systems before pushing them. > It looks like the test tunnels an FTP connection through a HTTP proxy and > because the mode of the <datacheck> is text, LF is compared for the HTTP > responses rather than CRLF which looking at the <connect> section these lines > have. Yes, even though I thought that this commit [1] would make it convert all line-endings to CRLF on Windows and not touch them on any other system. Basically the HTTP headers should use CRLF everywhere and the FTP listing should be text-aware. > I'm not sure whether we can split the <datacheck> up into multiple items for > example: > > <datacheck1> > HTTP/1.1 200 Mighty fine indeed > Magic: sure you can FTP me > HTTP/1.1 200 Mighty fine indeed > Magic: sure you can FTP me > </datacheck1> > > <datacheck2 mode="text"> > total 20 > drwxr-xr-x 8 98 98 512 Oct 22 13:06 . > drwxr-xr-x 8 98 98 512 Oct 22 13:06 .. > drwxr-xr-x 2 98 98 512 May 2 1996 .NeXT > -r--r--r-- 1 0 1 35 Jul 16 1996 README > lrwxrwxrwx 1 0 1 7 Dec 9 1999 bin -> usr/bin > dr-xr-xr-x 2 0 1 512 Oct 1 1997 dev > drwxrwxrwx 2 98 98 512 May 29 16:04 download.html > dr-xr-xr-x 2 0 1 512 Nov 30 1995 etc > drwxrwxrwx 2 98 1 512 Oct 30 14:33 pub > dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr > </datacheck2> That sounds like a good idea, even if it were not possible right now. Splitting binary protocol headers and text-aware content sections could in my opinion clarify many test cases. Unfortunately I am running out of time for this weekend. I won't be able to work on the test suite until next weekend, so please give it a go. Best regards, Marc [1] https://github.com/bagder/curl/commit/480ca49ecbdcc61a6c837799bb550a3e52915be6 ------------------------------------------------------------------- List admin: http://cool.haxx.se/list/listinfo/curl-library Etiquette: http://curl.haxx.se/mail/etiquette.html