diff options
141 files changed, 673 insertions, 669 deletions
@@ -14,7 +14,7 @@ Daniel Stenberg (13 Feb 2010) - Martin Hager reported and fixed a problem with a missing quote in libcurl.m4 (http://curl.haxx.se/bug/view.cgi?id=2951319) - + - Tom Donovan fixed the CURL_FORMAT_* defines when building with cmake. (http://curl.haxx.se/bug/view.cgi?id=2951269) @@ -244,7 +244,7 @@ Daniel Stenberg (26 Dec 2009) Daniel Stenberg (17 Dec 2009) - David Byron fixed Curl_ossl_cleanup to actually call ENGINE_cleanup when available. - + - 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 to make @@ -435,7 +435,7 @@ Daniel Stenberg (11 Nov 2009) in the DNS cache would linger too long if the request that added it was in use that long. He also provided the patch that now makes libcurl capable of still doing a request while the DNS hash entry may get timed out. - + - Christian Schmitz noticed that the progress meter/callback was not properly used during the FTP connection phase (after the actual TCP connect), while it of course should be. I also made the speed check get called correctly so @@ -530,7 +530,7 @@ Daniel Stenberg (1 Oct 2009) him grief. This is a regression that was introduced in 7.19.1 and I find it strange it hasn't hit us harder, but I won't persue into figuring out exactly why. - + - Constantine Sapuntzakis: The current implementation will always set SO_SNDBUF to CURL_WRITE_SIZE even if the SO_SNDBUF starts out larger. The patch doesn't do a setsockopt if SO_SNDBUF is already greater than @@ -564,7 +564,7 @@ Daniel Stenberg (25 Sep 2009) (http://curl.haxx.se/bug/view.cgi?id=2861587) identifying that libcurl used the OpenSSL function X509_load_crl_file() wrongly and failed if it would load a CRL file with more than one certificate within. This is now fixed. - + Daniel Stenberg (16 Sep 2009) - Sven Anders reported that we introduced a cert verfication flaw for OpenSSL- powered libcurl in 7.19.6. If there was a X509v3 Subject Alternative Name @@ -787,7 +787,7 @@ Michal Marek (15 Jul 2009) Guenter Knauf (14 Jul 2009) - renamed generated config.h to curl_config.h to avoid any future clashes with config.h from other projects. - + Daniel Stenberg (9 Jul 2009) - Eric Wong introduced curlx_nonblock() that the curl tool now (re-)uses for setting a file descriptor non-blocking. Used by the functionality Eric @@ -1239,7 +1239,7 @@ Yang Tse (2 Apr 2009) Daniel Stenberg (1 Apr 2009) - Andre Guibert de Bruet fixed a NULL pointer use in an infof() call if a - strdup() call failed. + strdup() call failed. Daniel Fandrich (31 Mar 2009) - Properly return an error code in curl_easy_recv (reported by Jim Freeman). @@ -1248,7 +1248,7 @@ Daniel Stenberg (18 Mar 2009) - Kamil Dudka brought a patch that enables 6 additional crypto algorithms when NSS is used. These ciphers were added in NSS 3.4 and require to be enabled explicitly. - + Daniel Stenberg (13 Mar 2009) - Use libssh2_version() to present the libssh2 version in case the libssh2 library is found to support it. @@ -1268,8 +1268,8 @@ Yang Tse (11 Mar 2009) reported by Pierre Brico. Daniel Stenberg (9 Mar 2009) -- Frank Hempel found out a bug and provided the fix: - +- Frank Hempel found out a bug and provided the fix: + curl_easy_duphandle did not necessarily duplicate the CURLOPT_COOKIEFILE option. It only enabled the cookie engine in the destination handle if data->cookies is not NULL (where data is the source handle). In case of a @@ -1288,7 +1288,7 @@ Daniel Stenberg (9 Mar 2009) checkouts who don't do cvs update with the -d option won't get the new dirs and then will get funny outputs that can be a bit hard to understand and fix. - + Daniel Stenberg (8 Mar 2009) - Andre Guibert de Bruet found and fixed a code segment in ssluse.c where the allocation of the memory BIO was not being properly checked. @@ -1361,7 +1361,7 @@ Daniel Stenberg (25 Feb 2009) just to avoid it to fail very early when libgcrypt dislikes the situation, but that move was bad and the fix should rather be in libgcrypt or elsewhere. - + Daniel Stenberg (24 Feb 2009) - Brian J. Murrell found out that Negotiate proxy authentication didn't work. It happened because the code used the struct for server-based auth all the @@ -1395,7 +1395,7 @@ Daniel Stenberg (20 Feb 2009) necessary to get read in ftp_done(). Daniel Stenberg (19 Feb 2009) -- Patrik Thunstrom reported a problem and helped me repeat it. It turned out +- Patrik Thunstrom reported a problem and helped me repeat it. It turned out libcurl did a superfluous 1000ms wait when doing SFTP downloads! We read data with libssh2 while doing the "DO" operation for SFTP and then @@ -1525,7 +1525,7 @@ Daniel Stenberg (26 Jan 2009) - Alexey Borzov filed bug report #2535504 (http://curl.haxx.se/bug/view.cgi?id=2535504) pointing out that realms with - quoted quotation marks in HTTP Digest headers didn't work. I've now added + quoted quotation marks in HTTP Digest headers didn't work. I've now added test case 1095 that verifies my fix. - Craig A West brought CURLOPT_NOPROXY and the corresponding --noproxy option. @@ -1676,7 +1676,7 @@ Daniel Stenberg (29 Dec 2008) Daniel Stenberg (28 Dec 2008) - Peter Korsgaard fixed building libcurl with "configure --with-ssl --disable-verbose". - + - Anthony Bryan fixed more language and spelling flaws in man pages. Daniel Stenberg (22 Dec 2008) @@ -2022,14 +2022,14 @@ Daniel S (22 October 2007) at connection cleanup, at which time the struct HandleData could be used by another connection. Also, the unused char *urlpath member is removed from struct FTP. - + #2 - provide a Curl_reset_reqproto() function that frees data->reqdata.proto.* on connection setup if needed (that is if the SessionHandle was used by a different connection). A long-term goal is of course to somehow get rid of how the reqdata struct is used, as it is too error-prone. - + - Bug report #1815530 (http://curl.haxx.se/bug/view.cgi?id=1815530) points out that specifying a proxy with a trailing slash didn't work (unless it also contained a port number). @@ -2125,7 +2125,7 @@ Daniel S (26 September 2007) method to GET in the subsequent request (like it does for response code 302 - because that's what many/most browsers do), but with this CURLOPT_POST301 option enabled it will do what the spec says and do the next request using - the same method again. I.e keep POST after 301. + the same method again. I.e keep POST after 301. The curl tool got this option as --post301 @@ -2272,11 +2272,11 @@ Dan F (30 August 2007) CURLE_FTP_QUOTE_ERROR => CURLE_QUOTE_ERROR CURLE_TFTP_DISKFULL => CURLE_REMOTE_DISK_FULL CURLE_TFTP_EXISTS => CURLE_REMOTE_FILE_EXISTS - CURLE_HTTP_RANGE_ERROR => CURLE_RANGE_ERROR + CURLE_HTTP_RANGE_ERROR => CURLE_RANGE_ERROR The following options were renamed: - CURLOPT_SSLKEYPASSWD => CURLOPT_KEYPASSWD + CURLOPT_SSLKEYPASSWD => CURLOPT_KEYPASSWD CURLOPT_FTPAPPEND => CURLOPT_APPEND CURLOPT_FTPLISTONLY => CURLOPT_DIRLISTONLY CURLOPT_FTP_SSL => CURLOPT_USE_SSL @@ -2552,7 +2552,7 @@ James H (5 July 2007) Daniel S (1 July 2007) - Thomas J. Moore provided a patch that introduces Kerberos5 support in libcurl. This also makes the options change name to --krb (from --krb4) and - CURLOPT_KRBLEVEL (from CURLOPT_KRB4LEVEL) but the old names are still + CURLOPT_KRBLEVEL (from CURLOPT_KRB4LEVEL) but the old names are still - Song Ma helped me verify and extend a fix for doing FTP over a SOCKS4/5 proxy. @@ -2581,7 +2581,7 @@ Daniel S (25 June 2007) chunked encoding (that also lacks "Connection: close"). It now simply assumes that the connection WILL be closed to signal the end, as that is how RFC2616 section 4.4 point #5 says we should behave. - + Version 7.16.3 (25 June 2007) Daniel S (23 June 2007) @@ -2595,7 +2595,7 @@ Daniel S (21 June 2007) - Gerrit Bruchhäuser pointed out a warning that the Intel(R) Thread Checker tool reports and it was indeed a legitimate one and it is one fixed. It was a use of a share without doing the proper locking first. - + Daniel S (20 June 2007) - Adam Piggott filed bug report #1740263 (http://curl.haxx.se/bug/view.cgi?id=1740263). Adam discovered that when @@ -2712,7 +2712,7 @@ Daniel S (24 May 2007) - Song Ma filed bug report #1724016 (http://curl.haxx.se/bug/view.cgi?id=1724016) noticing that downloading glob-ranges for TFTP was broken in CVS. Fixed now. - + - 'mytx' in bug report #1723194 (http://curl.haxx.se/bug/view.cgi?id=1723194) pointed out that the warnf() function in the curl tool didn't properly deal with the cases when excessively long words were used in the string to chop @@ -3012,7 +3012,7 @@ Yang Tse (20 March 2007) Yang Tse (19 March 2007) - Bryan Henderson fixed the progress function so that it can get called more frequently allowing same calling frecuency for the client progress callback. - + Dan F (15 March 2007) - Various memory leaks plugged and NULL pointer fixes made in the ssh code. @@ -3090,11 +3090,11 @@ Daniel (27 February 2007) server through a proxy and have the remote https server port set using the CURLOPT_PORT option, protocol gets reset to http from https after the first request. - + User defined URL was modified internally by libcurl and subsequent reuse of the easy handle may lead to connection using a different protocol (if not originally http). - + I found that libcurl hardcoded the protocol to "http" when it tries to regenerate the URL if CURLOPT_PORT is set. I tried to fix the problem as follows and it's working fine so far @@ -3179,7 +3179,7 @@ Daniel (12 February 2007) - release tarballs made with maketgz will from now on have a LIBCURL_TIMESTAMP define set to hold the exact date and time of when the tarball was built, as a human readable string using the UTC time zone. - + - Jeff Pohlmeyer fixed a flaw in curl_multi_add_handle() when adding a handle that has an easy handle present in the "closure" list pending closure. @@ -3703,7 +3703,7 @@ Daniel (6 September 2006) an FTP connection. This is a major change. - + Daniel (4 September 2006) - Dmitry Rechkin (http://curl.haxx.se/bug/view.cgi?id=1551412) provided a patch that while not fixing things very nicely, it does make the SOCKS5 @@ -4433,7 +4433,7 @@ Daniel (6 December 2005) given a too long URL. These overflows happen if you - + 1 - pass in a URL with no protocol (like "http://") prefix, using no slash and the string is 256 bytes or longer. This leads to a single zero byte overflow of the malloced buffer. @@ -4900,7 +4900,7 @@ Daniel (6 June 2005) executable, while is just a local directory (I have . in the PATH) 2) I got several warning for head -1 deprecated in favour of head -n 1 - + 3) ares directory is missing some file (missing is missing :-) ) because automake and friends is not run. @@ -4987,7 +4987,7 @@ Version 7.14.0-pre2 (11 May 2005) Daniel (11 May 2005) - Starting now, libcurl sends a little different set of headers in its default HTTP requests: - + A) Normal non-proxy HTTP: - no more "Pragma: no-cache" (this only makes sense to proxies) @@ -8083,7 +8083,7 @@ Version 7.10.8-pre1 (8 September 2003) Daniel (7 September) - Jurij Smakov found out that the non-OpenSSL MD5 code was not working on Alpha (or ia64). Only the OpenSSL-version did. I made a fix I think corrects - the problem. + the problem. Daniel (5 September) - Kevin Fisk reported that configure --enable-thread didn't work. I fixed. @@ -8102,7 +8102,7 @@ Early (4 September) - include/curl/curl.h Added option CURLOPT_FTP_RESPONSE_TIMEOUT - lib/ftp.c - Added branch inside Curl_GetFTPResponse to check for + Added branch inside Curl_GetFTPResponse to check for data->set.ftp_response_timeout - lib/url.c Modified Curl_setopt to recognize CURLOPT_FTP_RESPONSE_TIMEOUT @@ -8264,7 +8264,7 @@ Early (6 August) - Added option CURLOPT_FTP_CREATE_MISSING_DIRS This option will force the target file's path to be created if it does not already exist on the remote system. - + Files affected: - include/curl/curl.h Added option CURLOPT_FTP_CREATE_MISSING_DIRS @@ -8276,12 +8276,12 @@ Early (6 August) Modified ftp_perform() to call its change directory function through a pointer. The pointer points to ftp_cwd by default, and is modified to point to ftp_force_cwd IFF - data->set.ftp_create_missing_dirs is not 0. + data->set.ftp_create_missing_dirs is not 0. - lib/url.c Modified Curl_setopt to recognize CURLOPT_FTP_CREATE_MISSING_DIRS - lib/urldata.h Added ftp_create_missing_dirs to struct UserDefined - + - Minor Bugfix for CURLOPT_TIMECONDITION with FTP - if the file was not present to do the time comparison, it would fail. Files affected: @@ -8292,9 +8292,9 @@ Early (6 August) return result; And then by the code that actually did the time comparison. The code that did the comparison handled the case where the filetime - was not available (as indicated by info.filetime < 0 or set.timevalue + was not available (as indicated by info.filetime < 0 or set.timevalue < 0), so I replaced the if (result) return result with a switch(result) - that allows CURLE_FTP_COULDNT_RETR_FILE to fall through to the + that allows CURLE_FTP_COULDNT_RETR_FILE to fall through to the normal time comparison. Daniel (3 August) @@ -8491,7 +8491,7 @@ Daniel (16 June) - I remade the HTTP Digest code to use the MD5-code provided by OpenSSL if that is present, and only use our own MD5-code if it isn't. - + Daniel (13 June) - More NTLM help, fixes and patches from Cris Bailiff. @@ -9112,7 +9112,7 @@ Version 7.10.3-pre5 (9 Jan 2003) Daniel (9 Jan 2003) - Fixed tests/memanalyze.pl to work with file names that contain colons (as on Windows). - + - Kjetil Jacobsen quickly pointed out that lib/share.h was missing... Version 7.10.3-pre4 (9 Jan 2003) @@ -9404,7 +9404,7 @@ Daniel (21 Oct 2002) - Albert Chin helped me get the -no-undefined option corrected in lib/Makefile.am since Cygwin builds want it there while Solaris builds don't want it present. Kevin Roth helped me try it out on cygwin. - + - Nikita Schmidt provided a bug fix for a FOLLOWLOCATION bug introduced when the ../ support got in (7.10.1). @@ -9648,7 +9648,7 @@ Daniel (9 Aug 2002) signals to get sent. This is basicly for multi-threaded applications that now can use timeouts properly, without risking any signals to burst in and ruin the party. - + Daniel (5 Aug 2002) - Lukasz Czekierda reported that RFC2732-style literal IPv6 addresses didn't work. When did that code vanish? Anyway, it's back again now and seems to @@ -9737,7 +9737,7 @@ Daniel (12 Jun 2002) CURLFORM_BUFFERPTR, CURLFORM_BUFFERLENGTH. They are used to create a multipart that appears as a regular file upload, but the data is provided with a pointer and length. - + - Nico Baggus made the VMS version use sigsetjmp() too. - Jörn Hartroth fixed the mingw32 build using the mm lib. @@ -10564,7 +10564,7 @@ Daniel (16 January 2002) function for version information. This way, curl will report the version of the SSL library actually running right now, not the one that had its headers installed when libcurl was built. Mainly intersting when running with shared - OpenSSL libraries. + OpenSSL libraries. Version 7.9.3-pre2 @@ -10947,7 +10947,7 @@ Daniel (8 November 2001) gethostbyname_r() but can't figure out how to use it, and it should really figure out how to use it as it was running Linux and we know how that works... - + Daniel (7 November 2001) - docs/VERSIONS is a new file in the archive that explains the version number system we use in the curl project. @@ -11325,7 +11325,7 @@ Daniel (3 September 2001) - Installed libtool 1.4.1, libtoolized and everything. Daniel (1 September 2001) -- Heikki Korpela pointed out that I did not ship the proper libtool stuff in +- Heikki Korpela pointed out that I did not ship the proper libtool stuff in the pre-releases, even though that was my intention. libtoolize has now been re-run. @@ -11832,7 +11832,7 @@ Daniel (11 May 2001) another one. - Ingo Wilken patched away two redirect problems more! - + Daniel (10 May 2001) - Cris Bailiff correctly noted that the space-after-header problem with Location: is present on several other places in the libcurl sources. @@ -11851,7 +11851,7 @@ Daniel (9 May 2001) - stunnel.pm was accidentally left out from the release archive, it is now added (stunnel is needed to run the https-tests in the test suite) - + Daniel (7 May 2001) - Corrected two minor compiler warnings due to the FILE * to void * conversion that I missed at two places. Jörn Hartroth brought me patches. Sander Gates @@ -12445,7 +12445,7 @@ Daniel (29 January 2001) Version 7.6.1-pre1 Daniel (29 January 2001) -- Yet another Content-Range change. Ok now? Bob Schader checks from his end +- Yet another Content-Range change. Ok now? Bob Schader checks from his end and it works for him. Daniel (27 January 2001) @@ -12817,7 +12817,7 @@ Daniel (13 November 2000) - While writing test cases for the test suite, I discovered an old limitation that prevented -o and -T to be used at the same time. I removed this immediately as this has no relevance in the current libcurl. - + - Chris Faherty fixed a free-twice problem in lib/file.c - I fixed the perl http server problem in the test suite. @@ -12840,7 +12840,7 @@ Daniel (10 November 2000) - Angus Mackay's getpass_r() in lib/getpass.c is now compliant with the getpass_r() function it seems some systems actually have. - + - Venkataramana Mokkapati detected a bug in the cookie parser and corrected it. If the cookie was set for the full host name (domain=full.host.com), the cookie was never sent back because of a faulty length comparison between @@ -12851,7 +12851,7 @@ Daniel (9 November 2000) it). Added a check for RSAglue/rsaref for the cases where libcrypto is found but libssl isn't. I haven't verified this fix yet though, as I have no system that requires those libs to build. - + Version 7.4.2 pre3 Daniel (7 November 2000) @@ -12869,7 +12869,7 @@ Daniel (6 November 2000) - Emmanuel Tychon discovered that curl didn't really like user names only in the URL. I corrected this and I also fixed the since long living problem with URL encoded user names and passwords in the URLs. They should work now. - + Daniel (2 November 2000) - When I added --interface, the new error code that was added with it was inserted in the wrong place and thus all error codes from 35 and upwards got @@ -12896,7 +12896,7 @@ Daniel (30 October 2000) and then use the CURLOPT_CAINFO to set the certificate to verify the remote peer against. After an such an operation with a verification request, the *_getinfo() option CURLINFO_SSL_VERIFYRESULT will return information about - whether the verification succeeded or not. + whether the verification succeeded or not. Daniel (27 October 2000) - Georg Horn brought us a splendid patch that solves the long-standing @@ -12911,7 +12911,7 @@ Daniel (26 October 2000) getpass() function (now known as my_getpass()) was also fixed to not use any static buffers. This also means we cannot use the "standard" getpass() function even for those systems that have it, since it isn't thread-safe. - + - Kevin Roth found out that if you'd write a config file with '-v url', the url would not be used as "default URL" as documented, although if you wrote it 'url -v' it worked! This has been corrected now. @@ -12939,7 +12939,7 @@ Daniel (23 October 2000) -u or -U flags (CURLOPT_USERPWD and CURLOPT_PROXYUSERPWD). This also suggests that curl probably should url-decode the password piece of an URL so that you could pass an encoded @-letter there... - + Daniel (20 October 2000) - Yet another http server barfed on curl's request that include the port number in the Host: header always. I now only include the port number if it @@ -12953,7 +12953,7 @@ Daniel (17 October 2000) - Vladimir Oblomov reported that the -Y and -y options didn't work. They didn't work for me either. This once again proves we should have that test suite... - + - I finally changed the error message libcurl returns if you try a https:// URL when the library wasn't build with SSL enabled. It will now return this error: @@ -13046,7 +13046,7 @@ Daniel (4 October 2000) as is the -w section in curl.1. I added two options to enable the user to get information about the received headers' size and the size of the HTTP request. T. Bharath requested them. - + Daniel (3 October 2000) - Corrected a sever free() before use in the new add_buffer_send()! ;-) @@ -13073,7 +13073,7 @@ Daniel (2 October 2000) start with. If curl's average upload speed is faster than buffer size bytes per second, curl will increase the used buffer size up to max 50Kb. It should make the progress meter work better. - + Version 7.4 pre1 Daniel (29 September 2000) @@ -13103,7 +13103,7 @@ Daniel (26 September 2000) - I changed the OpenSSL fix to work with older versions as well. The posted patch was only working with 0.9.6 and no older ones. - + Version 7.3-pre8 Daniel (25 September 2000) @@ -13190,7 +13190,7 @@ Daniel (15 September 2000) - Kai-Uwe Rommel pointed out a problem in the httpproxytunnel stuff for ftp. Adjusted it. Added better info message when setting up the tunnel and the pasv message when doing the second connect. - + Version 7.3pre1 Daniel (15 September 2000) @@ -13199,7 +13199,7 @@ Daniel (15 September 2000) - TheArtOfHTTPScripting was corrected all over. I both type and spell really bad at times! - + Daniel (14 September 2000) - -p/--proxytunnel was added to 'curl'. It uses the new CURLOPT_HTTPPROXYTUNNEL libcurl option that allows "any" protocol to tunnel @@ -14364,7 +14364,7 @@ Version 5.10 Troy (12 August 1999) - Added MingW32 (GCC-2.95) support under Win32. The INSTALL file was also a bit rearranged. - + Daniel (12 August 1999) - I had to copy a good <arpa/telnet.h> include file into the curl source tree to enable the silly win32 systems to compile. The distribution rights @@ -14436,7 +14436,7 @@ Version 5.10 Daniel (2 August 1999) - Applied a progress-bar patch from Lars J. Aas. It offers - a new styled progress bar enabled with -#/--progress-bar. + a new styled progress bar enabled with -#/--progress-bar. T. Yamada <tai at imasy.or.jp> (30 July 1999) - It breaks with segfault when 1) curl is using .netrc to obtain @@ -14662,7 +14662,7 @@ Version 5.6.3beta start. The fix dated April 6 and posted on the mailing list forced curl to use v2 at all times using a modern OpenSSL version, but we don't really want such a crippled solution. - + - Marc Boucher sent me a patch that corrected a math error for the "Curr.Speed" progress meter. @@ -15074,7 +15074,7 @@ Version 5.0 beta 21 - Ok, I expanded the tgz-target to update the version string on each occation I build a release archive! - I reacted on Angus Mackay's initiative and remade the parameter parser to - be more getopt compliant. Curl now supports "merged" flags as in + be more getopt compliant. Curl now supports "merged" flags as in curl -lsv ftp.site.com Do note that I had to move three short-names of the options. Parameters that needs an additional string such as -x must be stand-alone or the @@ -15296,7 +15296,7 @@ Version 4.5.1 - SSL through proxy fix - Added -A to allow User-Agent: changes - Daniel Stenberg + Daniel Stenberg - Made the -A work when SSL-through-proxy. Version 4.5 @@ -15416,7 +15416,7 @@ Version 3.2 Daniel Stenberg - Major rewrite of two crucial parts of this code: upload and download. They are both now using a select() switch, that allows much better - progress meter and time control. + progress meter and time control. - alarm() usage removed completely - FTP get can now list directory contents if the path ends with a slash '/'. Urlget on a ftp-path that doesn't end with a slash means urlget will @@ -15459,7 +15459,7 @@ Version 2.9 Remco van Hooff - Added a fix to make it compile smoothly on Amiga using the SAS/C compiler. - + Daniel Stenberg - Believe it or not, but the STUPID Novell web server seems to require that the Host: keyword is used, so well I use it and I (re-introduce) the @@ -15477,7 +15477,7 @@ Version 2.7 fetch multipart files like that. - '-f' is introduced, it means Fail without output in case of HTTP server errors (return code >=300). - - Added support for -r, ranges. Specify which part of a document you + - Added support for -r, ranges. Specify which part of a document you want, and only that part is returned. Only with HTTP/1.1-servers. - Split up the source in 3 parts. Now all pure URL functions are in urlget.c and stuff that deals with the stand-alone program is in main.c. @@ -15545,7 +15545,7 @@ Version 2.2 Johan Andersson - The urlget function didn't set the path to url when using proxy. - Fixed bug with IMC proxy. Now using (almost) complete GET command. - + Daniel Stenberg - Made it compile on Solaris. Had to reorganize the includes a bit. (so Win32, Linux, SunOS 4 and Solaris 2 compile fine.) diff --git a/CMake/CheckTypeSize.cmake b/CMake/CheckTypeSize.cmake index 9b601946d..e768254d6 100644 --- a/CMake/CheckTypeSize.cmake +++ b/CMake/CheckTypeSize.cmake @@ -11,11 +11,11 @@ macro(CHECK_TYPE_SIZE TYPE VARIABLE) if(NOT DEFINED ${VARIABLE}) if("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$") set(CHECK_TYPE_SIZE_TYPE "${TYPE}") - set(MACRO_CHECK_TYPE_SIZE_FLAGS + set(MACRO_CHECK_TYPE_SIZE_FLAGS "${CMAKE_REQUIRED_FLAGS}") foreach(def HAVE_SYS_TYPES_H HAVE_STDINT_H HAVE_STDDEF_H) if("${def}") - set(MACRO_CHECK_TYPE_SIZE_FLAGS + set(MACRO_CHECK_TYPE_SIZE_FLAGS "${MACRO_CHECK_TYPE_SIZE_FLAGS} -D${def}") endif("${def}") endforeach(def) @@ -25,14 +25,14 @@ macro(CHECK_TYPE_SIZE TYPE VARIABLE) endforeach(def) configure_file( "${CMAKE_CURRENT_SOURCE_DIR}/CMake/CheckTypeSize.c.in" - "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckTypeSize.c" + "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckTypeSize.c" IMMEDIATE @ONLY) - file(READ + file(READ "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckTypeSize.c" CHECK_TYPE_SIZE_FILE_CONTENT) message(STATUS "Check size of ${TYPE}") if(CMAKE_REQUIRED_LIBRARIES) - set(CHECK_TYPE_SIZE_ADD_LIBRARIES + set(CHECK_TYPE_SIZE_ADD_LIBRARIES "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}") endif(CMAKE_REQUIRED_LIBRARIES) try_run(${VARIABLE} HAVE_${VARIABLE} @@ -43,11 +43,11 @@ macro(CHECK_TYPE_SIZE TYPE VARIABLE) OUTPUT_VARIABLE OUTPUT) if(HAVE_${VARIABLE}) message(STATUS "Check size of ${TYPE} - done") - file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log + file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log "Determining size of ${TYPE} passed with the following output:\n${OUTPUT}\n\n") else(HAVE_${VARIABLE}) message(STATUS "Check size of ${TYPE} - failed") - file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log + file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log "Determining size of ${TYPE} failed with the following output:\n${OUTPUT}\nCheckTypeSize.c:\n${CHECK_TYPE_SIZE_FILE_CONTENT}\n\n") endif(HAVE_${VARIABLE}) endif("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$") diff --git a/CMake/CurlTests.c b/CMake/CurlTests.c index 91a754c86..a3851a5f1 100644 --- a/CMake/CurlTests.c +++ b/CMake/CurlTests.c @@ -1,6 +1,6 @@ #ifdef TIME_WITH_SYS_TIME /* Time with sys/time test */ - + #include <sys/types.h> #include <sys/time.h> #include <time.h> diff --git a/CMake/OtherTests.cmake b/CMake/OtherTests.cmake index 50fa67559..89d004844 100644 --- a/CMake/OtherTests.cmake +++ b/CMake/OtherTests.cmake @@ -68,7 +68,7 @@ if(curl_cv_recv) endforeach(recv_arg3) endforeach(recv_arg2) endforeach(recv_arg1) - endforeach(recv_retv) + endforeach(recv_retv) else(NOT DEFINED curl_cv_func_recv_args OR "${curl_cv_func_recv_args}" STREQUAL "unknown") string(REGEX REPLACE "^([^,]*),[^,]*,[^,]*,[^,]*,[^,]*$" "\\1" RECV_TYPE_ARG1 "${curl_cv_func_recv_args}") string(REGEX REPLACE "^[^,]*,([^,]*),[^,]*,[^,]*,[^,]*$" "\\1" RECV_TYPE_ARG2 "${curl_cv_func_recv_args}") @@ -81,7 +81,7 @@ if(curl_cv_recv) #MESSAGE("RECV_TYPE_ARG4 ${RECV_TYPE_ARG4}") #MESSAGE("RECV_TYPE_RETV ${RECV_TYPE_RETV}") endif(NOT DEFINED curl_cv_func_recv_args OR "${curl_cv_func_recv_args}" STREQUAL "unknown") - + if("${curl_cv_func_recv_args}" STREQUAL "unknown") message(FATAL_ERROR "Cannot find proper types to use for recv args") endif("${curl_cv_func_recv_args}" STREQUAL "unknown") @@ -134,7 +134,7 @@ if(curl_cv_send) endforeach(send_arg3) endforeach(send_arg2) endforeach(send_arg1) - endforeach(send_retv) + endforeach(send_retv) else(NOT DEFINED curl_cv_func_send_args OR "${curl_cv_func_send_args}" STREQUAL "unknown") string(REGEX REPLACE "^([^,]*),[^,]*,[^,]*,[^,]*,[^,]*,[^,]*$" "\\1" SEND_TYPE_ARG1 "${curl_cv_func_send_args}") string(REGEX REPLACE "^[^,]*,([^,]*),[^,]*,[^,]*,[^,]*,[^,]*$" "\\1" SEND_TYPE_ARG2 "${curl_cv_func_send_args}") @@ -149,7 +149,7 @@ if(curl_cv_send) #MESSAGE("SEND_TYPE_RETV ${SEND_TYPE_RETV}") #MESSAGE("SEND_QUAL_ARG2 ${SEND_QUAL_ARG2}") endif(NOT DEFINED curl_cv_func_send_args OR "${curl_cv_func_send_args}" STREQUAL "unknown") - + if("${curl_cv_func_send_args}" STREQUAL "unknown") message(FATAL_ERROR "Cannot find proper types to use for send args") endif("${curl_cv_func_send_args}" STREQUAL "unknown") @@ -1,7 +1,7 @@ - _ _ ____ _ - ___| | | | _ \| | - / __| | | | |_) | | - | (__| |_| | _ <| |___ + _ _ ____ _ + ___| | | | _ \| | + / __| | | | |_) | | + | (__| |_| | _ <| |___ \___|\___/|_| \_\_____| CVS-INFO diff --git a/MacOSX-Framework b/MacOSX-Framework index b046fba60..032d5dfc7 100755 --- a/MacOSX-Framework +++ b/MacOSX-Framework @@ -1,5 +1,5 @@ #!/bin/bash -# This script performs all of the steps needed to build a +# This script performs all of the steps needed to build a # universal binary libcurl.framework for Mac OS X 10.4 or greater. VERSION=`/usr/bin/sed -ne 's/^#define LIBCURL_VERSION "\(.*\)"/\1/p' include/curl/curlver.h` @@ -22,10 +22,10 @@ if test -d $SDK32; then CFLAGS="-Os -isysroot $SDK32 $ARCHES32 $MINVER32" \ LDFLAGS="-Wl,-syslibroot,$SDK32 $ARCHES32 $MINVER32 -Wl,-headerpad_max_install_names" \ CC=$CC - + echo "----Building 32 bit libcurl..." make - + echo "----Creating 32 bit framework..." rm -r libcurl.framework mkdir -p libcurl.framework/Versions/A/Resources @@ -40,7 +40,7 @@ if test -d $SDK32; then ln -fs Versions/A/Headers Headers cd Versions ln -fs A Current - + if test -d $SDK64; then popd make clean @@ -49,10 +49,10 @@ if test -d $SDK32; then CFLAGS="-Os -isysroot $SDK64 $ARCHES64 $MINVER64" \ LDFLAGS="-Wl,-syslibroot,$SDK64 $ARCHES64 $MINVER64 -Wl,-headerpad_max_install_names" \ CC=$CC - + echo "----Building 64 bit libcurl..." make - + echo "----Appending 64 bit framework to 32 bit framework..." cp lib/.libs/libcurl.dylib libcurl.framework/Versions/A/libcurl64 install_name_tool -id @executable_path/../Frameworks/libcurl.framework/Versions/A/libcurl libcurl.framework/Versions/A/libcurl64 @@ -69,7 +69,7 @@ if test -d $SDK32; then #endif EOF fi - + lipo -info libcurl.framework/Versions/A/libcurl echo "libcurl.framework is built and can now be included in other projects." echo "Copy libcurl.framework to your bundle's Contents/Frameworks folder, ~/Library/Frameworks or /Library/Frameworks." diff --git a/acinclude.m4 b/acinclude.m4 index cf9201651..eb5fb06d9 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -167,7 +167,7 @@ AC_DEFUN([CURL_CHECK_AIX_ALL_SOURCE], [ dnl CURL_CHECK_HEADER_WINDOWS dnl ------------------------------------------------- -dnl Check for compilable and valid windows.h header +dnl Check for compilable and valid windows.h header AC_DEFUN([CURL_CHECK_HEADER_WINDOWS], [ AC_CACHE_CHECK([for windows.h], [ac_cv_header_windows_h], [ @@ -240,7 +240,7 @@ AC_DEFUN([CURL_CHECK_NATIVE_WINDOWS], [ dnl CURL_CHECK_HEADER_WINSOCK dnl ------------------------------------------------- -dnl Check for compilable and valid winsock.h header +dnl Check for compilable and valid winsock.h header AC_DEFUN([CURL_CHECK_HEADER_WINSOCK], [ AC_REQUIRE([CURL_CHECK_HEADER_WINDOWS])dnl @@ -277,7 +277,7 @@ AC_DEFUN([CURL_CHECK_HEADER_WINSOCK], [ dnl CURL_CHECK_HEADER_WINSOCK2 dnl ------------------------------------------------- -dnl Check for compilable and valid winsock2.h header +dnl Check for compilable and valid winsock2.h header AC_DEFUN([CURL_CHECK_HEADER_WINSOCK2], [ AC_REQUIRE([CURL_CHECK_HEADER_WINDOWS])dnl @@ -966,13 +966,13 @@ AC_DEFUN([CURL_CHECK_HEADER_MEMORY], [ dnl CURL_CHECK_FUNC_GETNAMEINFO dnl ------------------------------------------------- -dnl Test if the getnameinfo function is available, +dnl Test if the getnameinfo function is available, dnl and check the types of five of its arguments. dnl If the function succeeds HAVE_GETNAMEINFO will be dnl defined, defining the types of the arguments in dnl GETNAMEINFO_TYPE_ARG1, GETNAMEINFO_TYPE_ARG2, dnl GETNAMEINFO_TYPE_ARG46 and GETNAMEINFO_TYPE_ARG7, -dnl and also defining the type qualifier of first +dnl and also defining the type qualifier of first dnl argument in GETNAMEINFO_QUAL_ARG1. AC_DEFUN([CURL_CHECK_FUNC_GETNAMEINFO], [ @@ -1056,7 +1056,7 @@ AC_DEFUN([CURL_CHECK_FUNC_GETNAMEINFO], [ if test "$curl_cv_func_getnameinfo_args" = "unknown"; then AC_COMPILE_IFELSE([ AC_LANG_PROGRAM([[ -#undef inline +#undef inline #ifdef HAVE_WINDOWS_H #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN @@ -1067,7 +1067,7 @@ AC_DEFUN([CURL_CHECK_FUNC_GETNAMEINFO], [ #endif #include <windows.h> #ifdef HAVE_WINSOCK2_H -#include <winsock2.h> +#include <winsock2.h> #ifdef HAVE_WS2TCPIP_H #include <ws2tcpip.h> #endif @@ -1167,7 +1167,7 @@ AC_DEFUN([CURL_CHECK_FUNC_GETNAMEINFO], [ dnl TYPE_SOCKADDR_STORAGE dnl ------------------------------------------------- -dnl Check for struct sockaddr_storage. Most IPv6-enabled +dnl Check for struct sockaddr_storage. Most IPv6-enabled dnl hosts have it, but AIX 4.3 is one known exception. AC_DEFUN([TYPE_SOCKADDR_STORAGE], @@ -1213,7 +1213,7 @@ AC_DEFUN([CURL_CHECK_NI_WITHSCOPEID], [ AC_CHECK_HEADERS(stdio.h sys/types.h sys/socket.h \ netdb.h netinet/in.h arpa/inet.h) # - AC_CACHE_CHECK([for working NI_WITHSCOPEID], + AC_CACHE_CHECK([for working NI_WITHSCOPEID], [ac_cv_working_ni_withscopeid], [ AC_RUN_IFELSE([ AC_LANG_PROGRAM([[ @@ -1305,11 +1305,11 @@ AC_DEFUN([CURL_CHECK_NI_WITHSCOPEID], [ dnl CURL_CHECK_FUNC_RECV dnl ------------------------------------------------- -dnl Test if the socket recv() function is available, -dnl and check its return type and the types of its -dnl arguments. If the function succeeds HAVE_RECV -dnl will be defined, defining the types of the arguments -dnl in RECV_TYPE_ARG1, RECV_TYPE_ARG2, RECV_TYPE_ARG3 +dnl Test if the socket recv() function is available, +dnl and check its return type and the types of its +dnl arguments. If the function succeeds HAVE_RECV +dnl will be defined, defining the types of the arguments +dnl in RECV_TYPE_ARG1, RECV_TYPE_ARG2, RECV_TYPE_ARG3 dnl and RECV_TYPE_ARG4, defining the type of the function dnl return value in RECV_TYPE_RETV. @@ -1321,7 +1321,7 @@ AC_DEFUN([CURL_CHECK_FUNC_RECV], [ AC_MSG_CHECKING([for recv]) AC_LINK_IFELSE([ AC_LANG_PROGRAM([[ -#undef inline +#undef inline #ifdef HAVE_WINDOWS_H #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN @@ -1365,7 +1365,7 @@ AC_DEFUN([CURL_CHECK_FUNC_RECV], [ if test "$curl_cv_func_recv_args" = "unknown"; then AC_COMPILE_IFELSE([ AC_LANG_PROGRAM([[ -#undef inline +#undef inline #ifdef HAVE_WINDOWS_H #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN @@ -1438,13 +1438,13 @@ AC_DEFUN([CURL_CHECK_FUNC_RECV], [ dnl CURL_CHECK_FUNC_SEND dnl ------------------------------------------------- -dnl Test if the socket send() function is available, -dnl and check its return type and the types of its -dnl arguments. If the function succeeds HAVE_SEND -dnl will be defined, defining the types of the arguments -dnl in SEND_TYPE_ARG1, SEND_TYPE_ARG2, SEND_TYPE_ARG3 +dnl Test if the socket send() function is available, +dnl and check its return type and the types of its +dnl arguments. If the function succeeds HAVE_SEND +dnl will be defined, defining the types of the arguments +dnl in SEND_TYPE_ARG1, SEND_TYPE_ARG2, SEND_TYPE_ARG3 dnl and SEND_TYPE_ARG4, defining the type of the function -dnl return value in SEND_TYPE_RETV, and also defining the +dnl return value in SEND_TYPE_RETV, and also defining the dnl type qualifier of second argument in SEND_QUAL_ARG2. AC_DEFUN([CURL_CHECK_FUNC_SEND], [ @@ -1455,7 +1455,7 @@ AC_DEFUN([CURL_CHECK_FUNC_SEND], [ AC_MSG_CHECKING([for send]) AC_LINK_IFELSE([ AC_LANG_PROGRAM([[ -#undef inline +#undef inline #ifdef HAVE_WINDOWS_H #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN @@ -1499,7 +1499,7 @@ AC_DEFUN([CURL_CHECK_FUNC_SEND], [ if test "$curl_cv_func_send_args" = "unknown"; then AC_COMPILE_IFELSE([ AC_LANG_PROGRAM([[ -#undef inline +#undef inline #ifdef HAVE_WINDOWS_H #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN @@ -1623,7 +1623,7 @@ AC_DEFUN([CURL_CHECK_FUNC_RECVFROM], [ AC_MSG_CHECKING([for recvfrom]) AC_LINK_IFELSE([ AC_LANG_PROGRAM([[ -#undef inline +#undef inline #ifdef HAVE_WINDOWS_H #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN @@ -1669,7 +1669,7 @@ AC_DEFUN([CURL_CHECK_FUNC_RECVFROM], [ if test "$curl_cv_func_recvfrom_args" = "unknown"; then AC_COMPILE_IFELSE([ AC_LANG_PROGRAM([[ -#undef inline +#undef inline #ifdef HAVE_WINDOWS_H #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN @@ -1805,7 +1805,7 @@ AC_DEFUN([CURL_CHECK_MSG_NOSIGNAL], [ AC_CACHE_CHECK([for MSG_NOSIGNAL], [ac_cv_msg_nosignal], [ AC_COMPILE_IFELSE([ AC_LANG_PROGRAM([[ -#undef inline +#undef inline #ifdef HAVE_WINDOWS_H #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN @@ -1856,7 +1856,7 @@ AC_DEFUN([CURL_CHECK_STRUCT_TIMEVAL], [ AC_CACHE_CHECK([for struct timeval], [ac_cv_struct_timeval], [ AC_COMPILE_IFELSE([ AC_LANG_PROGRAM([[ -#undef inline +#undef inline #ifdef HAVE_WINDOWS_H #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN @@ -2815,8 +2815,8 @@ AC_HELP_STRING([--without-ca-path], [Don't use a default CA path]), done fi fi - - + + if test "x$ca" != "xno"; then CURL_CA_BUNDLE='"'$ca'"' @@ -3043,7 +3043,7 @@ AC_DEFUN([CURL_CONFIGURE_CURL_OFF_T], [ '__int32' \ 'int' ; do DO_CURL_OFF_T_CHECK([$t4], [4]) - done + done AC_MSG_RESULT([$curl_typeof_curl_off_t]) fi if test "$curl_typeof_curl_off_t" = "unknown"; then @@ -1,8 +1,8 @@ $Id$ - _ _ ____ _ - ___| | | | _ \| | - / __| | | | |_) | | - | (__| |_| | _ <| |___ + _ _ ____ _ + ___| | | | _ \| | + / __| | | | |_) | | + | (__| |_| | _ <| |___ \___|\___/|_| \_\_____| BUGS diff --git a/docs/CONTRIBUTE b/docs/CONTRIBUTE index 94e9a6cd4..df161d711 100644 --- a/docs/CONTRIBUTE +++ b/docs/CONTRIBUTE @@ -28,7 +28,7 @@ 2.10 Document 2.11 Test Cases - 3. Pushing Out Your Changes + 3. Pushing Out Your Changes 3.1 Write Access to CVS Repository 3.2 How To Make a Patch 3.3 How to get your changes into the main sources @@ -175,7 +175,7 @@ test case that verifies that it works as documented. If every submitter also posts a few test cases, it won't end up as a heavy burden on a single person! -3. Pushing Out Your Changes +3. Pushing Out Your Changes 3.1 Write Access to CVS Repository diff --git a/docs/DISTRO-DILEMMA b/docs/DISTRO-DILEMMA index 0be599326..108e6bad1 100644 --- a/docs/DISTRO-DILEMMA +++ b/docs/DISTRO-DILEMMA @@ -11,7 +11,7 @@ Condition This document reflects my view and understanding of these things. Please tell me where and how you think I'm wrong, and I'll try to correct my mistakes. -Background +Background The Free Software Foundation has deemed the Original BSD license[1] to be "incompatible"[2] with GPL[3]. I'd rather say it is the other way around, but @@ -90,7 +90,7 @@ FAQ 5.12 Can I make libcurl fake or hide my real IP address? 5.13 How do I stop an ongoing transfer? 5.14 Using C++ non-static functions for callbacks? - 5.15 How do I get an FTP directory listing? + 5.15 How do I get an FTP directory listing? 6. License Issues 6.1 I have a GPL program, can I use the libcurl library? @@ -648,7 +648,7 @@ FAQ curl ftp://ftp.sunet.se//tmp/ 3.18 Can I use curl to send a POST/PUT and not wait for a response? - + No. But you could easily write your own program using libcurl to do such stunts. @@ -1164,7 +1164,7 @@ FAQ curl_easy_setopt(hcurl, CURLOPT_WRITEFUNCTION, YourClass:staticFunction); curl_easy_setopt(hcurl, CURLOPT_WRITEDATA, this); - 5.15 How do I get an FTP directory listing? + 5.15 How do I get an FTP directory listing? If you end the FTP URL you request with a slash, libcurl will provide you with a directory listing of that given directory. You can also set diff --git a/docs/FEATURES b/docs/FEATURES index 08f342cd8..bc95aacd6 100644 --- a/docs/FEATURES +++ b/docs/FEATURES @@ -1,7 +1,7 @@ - _ _ ____ _ - ___| | | | _ \| | - / __| | | | |_) | | - | (__| |_| | _ <| |___ + _ _ ____ _ + ___| | | | _ \| | + / __| | | | |_) | | + | (__| |_| | _ <| |___ \___|\___/|_| \_\_____| FEATURES diff --git a/docs/INSTALL b/docs/INSTALL index 2e16c6ec9..7a13b5cf8 100644 --- a/docs/INSTALL +++ b/docs/INSTALL @@ -144,7 +144,7 @@ UNIX To get support for SCP and SFTP, build with --with-libssh2 and have libssh2 0.16 or later installed. - + SPECIAL CASES ------------- Some versions of uClibc require configuring with CPPFLAGS=-D_GNU_SOURCE=1 @@ -202,7 +202,7 @@ Win32 If you have any problems linking libraries or finding header files, be sure to verify that the provided "Makefile.m32" files use the proper paths, and - adjust as necessary. It is also possible to override these paths with + adjust as necessary. It is also possible to override these paths with environment variables, for example: set ZLIB_PATH=c:\zlib-1.2.3 @@ -676,8 +676,8 @@ eCos +++ src/main.c 24 Jul 2006 21:37:23 -0000 @@ -4286,11 +4286,31 @@ } - - + + +#ifdef __ECOS +#include <cyg/fileio/fileio.h> +MTAB_ENTRY( testfs_mte1, @@ -686,7 +686,7 @@ eCos + "", + 0); +#endif - + int main(int argc, char *argv[]) { int res; @@ -704,7 +704,7 @@ eCos + } +#endif memset(&config, 0, sizeof(struct Configurable)); - + config.errors = stderr; /* default errors to stderr */ @@ -713,7 +713,7 @@ Minix curl can be compiled on Minix 3 using gcc or ACK (starting with ver. 3.1.3). Ensure that GNU gawk and bash are both installed and available in the PATH. - + ACK --- Increase the heap sizes of the compiler with the command: @@ -730,9 +730,9 @@ Minix GCC --- Make sure gcc is in your PATH with the command: - + export PATH=/usr/gnu/bin:$PATH - + then configure and compile curl with: ./configure CC=gcc AR=/usr/gnu/bin/gar GREP=grep @@ -756,11 +756,11 @@ Symbian OS VxWorks ======== Build for VxWorks is performed using cross compilation. - That means you build on Windows machine using VxWorks tools and + That means you build on Windows machine using VxWorks tools and run the built image on the VxWorks device. - + To build libcurl for VxWorks you need: - + - CYGWIN (free, http://cygwin.com/) - Wind River Workbench (commercial) @@ -774,10 +774,10 @@ VxWorks 3. Adjust environment variables defined in 'Environment' section of the Makefile.vxworks file to point to your software folders. 4. Build the libcurl by typing 'make -f ./Makefile.vxworks' - - As a result the libcurl.a library should be created in the 'lib' folder. + + As a result the libcurl.a library should be created in the 'lib' folder. To clean the build results type 'make -f ./Makefile.vxworks clean'. - + CROSS COMPILE ============= diff --git a/docs/INSTALL.cmake b/docs/INSTALL.cmake index d9f1e7978..4217cebf1 100755 --- a/docs/INSTALL.cmake +++ b/docs/INSTALL.cmake @@ -14,9 +14,9 @@ Building with CMake CMake is specifed in the file CMakeLists.txt found in the top of the curl source tree. Once the correct version of CMake is installed you can follow the instructions below for the platform you are building on. - + CMake builds can be configured either from the command line, or from one - of CMake's GUI's. + of CMake's GUI's. Command Line CMake ================== @@ -30,7 +30,7 @@ Command Line CMake # the Curl source tree. CMake will pick a compiler for you. If you # want to specifiy the compile, you can set the CC environment # variable prior to running CMake. - cmake ../curl + cmake ../curl make # currently make test and make install are not implemented #make test @@ -54,12 +54,12 @@ cmake-gui 2. Fill in the "Where to build the binaries" combo box with the path to the directory for your build tree, ideally this should not be the same as the source tree, but a parallel diretory called curl-build or - something similar. + something similar. 3. Once the source and binary directories are specified, press the "Configure" button. - 4. Select the native build tool that you want to use. + 4. Select the native build tool that you want to use. 5. At this point you can change any of the options presented in the GUI. Once you have selected all the options you want, click the - "Generate" button. + "Generate" button. 6. Run the native build tool that you used CMake to genratate. - + diff --git a/docs/INSTALL.devcpp b/docs/INSTALL.devcpp index ed5ed9150..7f58e4b0e 100644 --- a/docs/INSTALL.devcpp +++ b/docs/INSTALL.devcpp @@ -1,13 +1,13 @@ DevCpp-Mingw Install & Compilation Sept 2005 ================================== -Reference Emails available at curl@haxx.se: +Reference Emails available at curl@haxx.se: Libcurl Install and Use Issues - Awaiting an Answer for Win 32 Install + Awaiting an Answer for Win 32 Install res = curl_easy_perform(curl); Error Makefile Issues - + Having previously done a thorough review of what was available that met my requirements under GPL, I settled for Libcurl as the software of choice for @@ -110,7 +110,7 @@ Next read the contents of Makefile.m32. It includes instructions on its use. Method I - DOS Command Line --------------------------- - + Note - The only reason I have included this method is that Method II which is the preferred method for compiling does not allow for the setting of option switches (e.g. SSL = 1 or SSL =0). At least that's what they tell me at the @@ -191,7 +191,7 @@ the contents of the LIB Folder. If not go there. files and close box. Wait till all files are added. This may take 30 seconds or longer. -9- Drop the Menu Execute/Click on Compile. +9- Drop the Menu Execute/Click on Compile. 10- That's it. @@ -269,7 +269,7 @@ added. Otherwise you may experience link errors. 2- Don't forget to include #include "curl/curl.h". e.g. - #define CURL_STATICLIB + #define CURL_STATICLIB #include <windows.h> #include "curl/curl.h" #include <fstream> diff --git a/docs/INTERNALS b/docs/INTERNALS index ced5df51f..c9c497140 100644 --- a/docs/INTERNALS +++ b/docs/INTERNALS @@ -1,7 +1,7 @@ - _ _ ____ _ - ___| | | | _ \| | - / __| | | | |_) | | - | (__| |_| | _ <| |___ + _ _ ____ _ + ___| | | | _ \| | + / __| | | | |_) | | + | (__| |_| | _ <| |___ \___|\___/|_| \_\_____| INTERNALS @@ -304,7 +304,7 @@ Library lib/timeval.c features replacement functions for systems that don't have gettimeofday() and a few support functions for timeval convertions. - + A function named curl_version() that returns the full curl version string is found in lib/version.c. @@ -375,7 +375,7 @@ SSL libraries Library Symbols =============== - + All symbols used internally in libcurl must use a 'Curl_' prefix if they're used in more than a single file. Single-file symbols must be made static. Public ("exported") symbols must use a 'curl_' prefix. (There are exceptions, diff --git a/docs/KNOWN_BUGS b/docs/KNOWN_BUGS index c38114141..2eefdea28 100644 --- a/docs/KNOWN_BUGS +++ b/docs/KNOWN_BUGS @@ -21,7 +21,7 @@ may have been fixed since this was written! 70. Problem re-using easy handle after call to curl_multi_remove_handle http://curl.haxx.se/mail/lib-2009-07/0249.html - + 68. "More questions about ares behavior". http://curl.haxx.se/mail/lib-2009-08/0012.html @@ -163,7 +163,7 @@ may have been fixed since this was written! to VMS file structures and the perceived file sizes stat() returns. A possible fix would involve sending a "STRU VMS" command. http://curl.haxx.se/bug/view.cgi?id=1156287 - + 21. FTP ASCII transfers do not follow RFC959. They don't convert the data accordingly (not for sending nor for receiving). RFC 959 section 3.1.1.1 clearly describes how this should be done: diff --git a/docs/MANUAL b/docs/MANUAL index b59231a03..208fc79c7 100644 --- a/docs/MANUAL +++ b/docs/MANUAL @@ -168,7 +168,7 @@ RANGES Get the first 100 bytes of a document using FTP: - curl -r 0-99 ftp://www.get.this/README + curl -r 0-99 ftp://www.get.this/README UPLOADING @@ -184,7 +184,7 @@ UPLOADING Upload a local file to the remote site, and use the local file name remote too: - + curl -T uploadfile -u user:passwd ftp://ftp.upload.com/ Upload a local file to get appended to the remote file: @@ -223,7 +223,7 @@ VERBOSE / DEBUG this: curl --trace trace.txt www.haxx.se - + DETAILED INFORMATION @@ -325,12 +325,12 @@ POST (HTTP) To send two files in one post you can do it in two ways: 1. Send multiple files in a single "field" with a single field name: - - curl -F "pictures=@dog.gif,cat.gif" - - 2. Send two fields with two field names: - curl -F "docpicture=@dog.gif" -F "catpicture=@cat.gif" + curl -F "pictures=@dog.gif,cat.gif" + + 2. Send two fields with two field names: + + curl -F "docpicture=@dog.gif" -F "catpicture=@cat.gif" To send a field value literally without interpreting a leading '@' or '<', or an embedded ';type=', use --form-string instead of @@ -678,15 +678,15 @@ HTTPS formatted one that curl can use, do something like this (assuming netscape, but IE is likely to work similarly): - You start with hitting the 'security' menu button in netscape. + You start with hitting the 'security' menu button in netscape. - Select 'certificates->yours' and then pick a certificate in the list + Select 'certificates->yours' and then pick a certificate in the list - Press the 'export' button + Press the 'export' button - enter your PIN code for the certs + enter your PIN code for the certs - select a proper place to save it + select a proper place to save it Run the 'openssl' application to convert the certificate. If you cd to the openssl installation, you can do it like: @@ -793,7 +793,7 @@ ENVIRONMENT VARIABLES They should be set for protocol-specific proxies. General proxy should be set with - + ALL_PROXY A comma-separated list of host names that shouldn't go through any proxy is diff --git a/docs/README.cmake b/docs/README.cmake index 7129b79ac..084c1de6d 100755 --- a/docs/README.cmake +++ b/docs/README.cmake @@ -1,7 +1,7 @@ - _ _ ____ _ - ___| | | | _ \| | - / __| | | | |_) | | - | (__| |_| | _ <| |___ + _ _ ____ _ + ___| | | | _ \| | + / __| | | | |_) | | + | (__| |_| | _ <| |___ \___|\___/|_| \_\_____| README.cmake @@ -10,7 +10,7 @@ README.cmake Curl contains CMake build files that provide a way to build Curl with the CMake build tool (www.cmake.org). CMake is a cross platform meta build tool that generates native makefiles and IDE project files. The CMake build - system can be used to build Curl on any of its supported platforms. + system can be used to build Curl on any of its supported platforms. Read the INSTALL.cmake file for instructions on how to compile curl with - CMake. + CMake. diff --git a/docs/README.netware b/docs/README.netware index 00a241ecf..41da2e8dc 100644 --- a/docs/README.netware +++ b/docs/README.netware @@ -1,7 +1,7 @@ - _ _ ____ _ - ___| | | | _ \| | - / __| | | | |_) | | - | (__| |_| | _ <| |___ + _ _ ____ _ + ___| | | | _ \| | + / __| | | | |_) | | + | (__| |_| | _ <| |___ \___|\___/|_| \_\_____| README.netware @@ -10,9 +10,9 @@ README.netware Curl has been successfully compiled with gcc / nlmconv on different flavours of Linux as well as with the official Metrowerks CodeWarrior compiler. - While not being the main development target, a continously growing share of + While not being the main development target, a continously growing share of curl users are NetWare-based, specially also consuming the lib from PHP. - + The unix-style man pages are tricky to read on windows, so therefore are all those pages converted to HTML as well as pdf, and included in the release archives. @@ -24,4 +24,4 @@ README.netware Read the INSTALL file for instructions how to compile curl self. - + diff --git a/docs/README.win32 b/docs/README.win32 index ec7a268ee..cfd45dd25 100644 --- a/docs/README.win32 +++ b/docs/README.win32 @@ -1,7 +1,7 @@ - _ _ ____ _ - ___| | | | _ \| | - / __| | | | |_) | | - | (__| |_| | _ <| |___ + _ _ ____ _ + ___| | | | _ \| | + / __| | | | |_) | | + | (__| |_| | _ <| |___ \___|\___/|_| \_\_____| README.win32 diff --git a/docs/RESOURCES b/docs/RESOURCES index 408efe182..b8bfc2fbd 100644 --- a/docs/RESOURCES +++ b/docs/RESOURCES @@ -1,7 +1,7 @@ - _ _ ____ _ - Project ___| | | | _ \| | - / __| | | | |_) | | - | (__| |_| | _ <| |___ + _ _ ____ _ + Project ___| | | | _ \| | + / __| | | | |_) | | + | (__| |_| | _ <| |___ \___|\___/|_| \_\_____| @@ -46,7 +46,7 @@ This document lists documents and standards used by curl. Character Sets, Languages, and Continuations RFC 2388 - "Returning Values from Forms: multipart/form-data" - Use this as an addition to the RFC1867 + Use this as an addition to the RFC1867 RFC 2396 - "Uniform Resource Identifiers: Generic Syntax and Semantics" This one obsoletes RFC 1738, but since RFC 1738 is often mentioned @@ -61,12 +61,12 @@ This document lists documents and standards used by curl. RFC 2617 - HTTP Authentication RFC 2718 - Guidelines for new URL Schemes - + RFC 2732 - Format for Literal IPv6 Addresses in URL's - + RFC 2818 - HTTP Over TLS (TLS is the successor to SSL) - + RFC 2964 - Use of HTTP State Management - + RFC 2965 - HTTP State Management Mechanism. Cookies. Obsoletes RFC2109 diff --git a/docs/SSLCERTS b/docs/SSLCERTS index 2ace720c2..0d1414cea 100644 --- a/docs/SSLCERTS +++ b/docs/SSLCERTS @@ -103,7 +103,7 @@ https://wiki.mozilla.org/NSS_Shared_DB Starting with version 7.19.7 libcurl will check for the NSS version it runs, and add automatically the 'sql:' prefix to the certdb directory (either the hardcoded default /etc/pki/nssdb or the directory configured with SSL_DIR -environment variable) if a version 3.12.0 or later is detected. +environment variable) if a version 3.12.0 or later is detected. To check which certdb format your distribution provides examine the default certdb location /etc/pki/nssdb; the new certdb format can be identified by the filenames cert9.db, key4.db, pkcs11.txt; filenames of older versions are @@ -1,7 +1,7 @@ - _ _ ____ _ - ___| | | | _ \| | - / __| | | | |_) | | - | (__| |_| | _ <| |___ + _ _ ____ _ + ___| | | | _ \| | + / __| | | | |_) | | + | (__| |_| | _ <| |___ \___|\___/|_| \_\_____| Things that could be nice to do in the future @@ -132,7 +132,7 @@ libcurl built without an asynchronous resolver library uses alarm() to time out DNS lookups. When a timeout occurs, this causes libcurl to jump from the - signal handler back into the library with a sigsetjmp, which effectively + signal handler back into the library with a sigsetjmp, which effectively causes libcurl to continue running within the signal handler. This is non-portable and could cause problems on some platforms. A discussion on the problem is available at http://curl.haxx.se/mail/lib-2008-09/0197.html diff --git a/docs/TheArtOfHttpScripting b/docs/TheArtOfHttpScripting index e4212db71..47eb52293 100644 --- a/docs/TheArtOfHttpScripting +++ b/docs/TheArtOfHttpScripting @@ -222,7 +222,7 @@ Date: May 28, 2008 The site might require a different authentication method (check the headers returned by the server), and then --ntlm, --digest, --negotiate or even --anyauth might be options that suit you. - + Sometimes your HTTP access is only available through the use of a HTTP proxy. This seems to be especially common at various companies. A HTTP proxy may require its own user and password to allow the client to get through to @@ -292,8 +292,8 @@ Date: May 28, 2008 such pages in the same manner it display all HTTP replies. It does however feature an option that will make it attempt to follow the Location: pointers. - To tell curl to follow a Location: - + To tell curl to follow a Location: + curl -L www.sitethatredirects.com If you use curl to POST to a site that immediately redirects you to another diff --git a/docs/VERSIONS b/docs/VERSIONS index cc11c1bbd..21c0d901a 100644 --- a/docs/VERSIONS +++ b/docs/VERSIONS @@ -1,7 +1,7 @@ - _ _ ____ _ - ___| | | | _ \| | - / __| | | | |_) | | - | (__| |_| | _ <| |___ + _ _ ____ _ + ___| | | | _ \| | + / __| | | | |_) | | + | (__| |_| | _ <| |___ \___|\___/|_| \_\_____| Version Numbers and Releases @@ -52,7 +52,7 @@ Version Numbers and Releases have the libcurl version stored in the curl/curlver.h file using a static numbering scheme that can be used for comparison. The version number is defined as: - + #define LIBCURL_VERSION_NUM 0xXXYYZZ Where XX, YY and ZZ are the main version, release and patch numbers in diff --git a/docs/curl-config.1 b/docs/curl-config.1 index b3bd3832b..9ebb7d22b 100644 --- a/docs/curl-config.1 +++ b/docs/curl-config.1 @@ -5,7 +5,7 @@ .\" * | (__| |_| | _ <| |___ .\" * \___|\___/|_| \_\_____| .\" * -.\" * Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al. +.\" * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. .\" * .\" * This software is licensed as described in the file COPYING, which .\" * you should have received as part of this distribution. The terms @@ -38,9 +38,9 @@ Displays the compiler used to build libcurl. Set of compiler options (CFLAGS) to use when compiling files that use libcurl. Currently that is only the include path to the curl include files. .IP "--checkfor [version]" -Specify the oldest possible libcurl version string you want, and this -script will return 0 if the current installation is new enough or it -returns 1 and outputs a text saying that the current version is not new +Specify the oldest possible libcurl version string you want, and this +script will return 0 if the current installation is new enough or it +returns 1 and outputs a text saying that the current version is not new enough. (Added in 7.15.4) .IP "--configure" Displays the arguments given to configure when building curl. diff --git a/docs/curl.1 b/docs/curl.1 index b491a7a8c..02e715f79 100644 --- a/docs/curl.1 +++ b/docs/curl.1 @@ -215,7 +215,7 @@ local directory hierarchy as needed. This option creates the dirs mentioned with the -o option, nothing else. If the -o file name uses no dir or if the dirs it mentions already exist, no dir will be created. -To create remote directories when using FTP or SFTP, try +To create remote directories when using FTP or SFTP, try \fI--ftp-create-dirs\fP. .IP "--crlf" (FTP) Convert LF to CRLF in upload. Useful for MVS (OS/390). diff --git a/docs/examples/Makefile.example b/docs/examples/Makefile.example index 7afe04cf6..5d9b7c9ca 100644 --- a/docs/examples/Makefile.example +++ b/docs/examples/Makefile.example @@ -1,8 +1,8 @@ ############################################################################# -# _ _ ____ _ -# Project ___| | | | _ \| | -# / __| | | | |_) | | -# | (__| |_| | _ <| |___ +# _ _ ____ _ +# Project ___| | | | _ \| | +# / __| | | | |_) | | +# | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # # $Id$ diff --git a/docs/examples/chkspeed.c b/docs/examples/chkspeed.c index 7d2a3da61..9eacd65f9 100644 --- a/docs/examples/chkspeed.c +++ b/docs/examples/chkspeed.c @@ -40,7 +40,7 @@ static size_t WriteCallback(void *ptr, size_t size, size_t nmemb, void *data) { /* we are not interested in the downloaded bytes itself, - so we only return the size we would have saved ... */ + so we only return the size we would have saved ... */ return (size_t)(size * nmemb); } @@ -57,7 +57,7 @@ int main(int argc, char *argv[]) for (argc--, argv++; *argv; argc--, argv++) { if (strncasecmp(*argv, "-", 1) == 0) { if (strncasecmp(*argv, "-H", 2) == 0) { - fprintf(stderr, + fprintf(stderr, "\rUsage: %s [-m=1|2|5|10|20|50|100] [-t] [-x] [url]\n", appname); exit(1); diff --git a/docs/examples/cookie_interface.c b/docs/examples/cookie_interface.c index 51b32428d..27bfa3932 100644 --- a/docs/examples/cookie_interface.c +++ b/docs/examples/cookie_interface.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * This example shows usage of simple cookie interface. + * This example shows usage of simple cookie interface. */ #include <stdio.h> @@ -80,7 +80,7 @@ main(void) res = curl_easy_setopt(curl, CURLOPT_COOKIELIST, nline); if (res != CURLE_OK) { fprintf(stderr, "Curl curl_easy_setopt failed: %s\n", curl_easy_strerror(res)); - return 1; + return 1; } /* HTTP-header style cookie */ @@ -90,7 +90,7 @@ main(void) res = curl_easy_setopt(curl, CURLOPT_COOKIELIST, nline); if (res != CURLE_OK) { fprintf(stderr, "Curl curl_easy_setopt failed: %s\n", curl_easy_strerror(res)); - return 1; + return 1; } print_cookies(curl); diff --git a/docs/examples/curlx.c b/docs/examples/curlx.c index 9b1c29158..62bdfe405 100644 --- a/docs/examples/curlx.c +++ b/docs/examples/curlx.c @@ -115,7 +115,7 @@ static const char *curlx_usage[]={ */ -/* +/* * We use this ZERO_NULL to avoid picky compiler warnings, * when assigning a NULL pointer to a function pointer var. */ diff --git a/docs/examples/ftpgetinfo.c b/docs/examples/ftpgetinfo.c index a0af09bb3..336cc79dd 100644 --- a/docs/examples/ftpgetinfo.c +++ b/docs/examples/ftpgetinfo.c @@ -23,7 +23,7 @@ static size_t throw_away(void *ptr, size_t size, size_t nmemb, void *data) { /* we are not interested in the headers itself, - so we only return the size we would have saved ... */ + so we only return the size we would have saved ... */ return (size_t)(size * nmemb); } @@ -45,7 +45,7 @@ int main(void) /* No download if the file */ curl_easy_setopt(curl, CURLOPT_NOBODY, 1L); /* Ask for filetime */ - curl_easy_setopt(curl, CURLOPT_FILETIME, 1L); + curl_easy_setopt(curl, CURLOPT_FILETIME, 1L); /* No header output: TODO 14.1 http-style HEAD output for ftp */ curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, throw_away); curl_easy_setopt(curl, CURLOPT_HEADER, 0L); diff --git a/docs/examples/multi-double.c b/docs/examples/multi-double.c index 0a4cde855..2fb6973bb 100644 --- a/docs/examples/multi-double.c +++ b/docs/examples/multi-double.c @@ -1,8 +1,8 @@ /***************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * * $Id$ diff --git a/docs/examples/multi-post.c b/docs/examples/multi-post.c index 18973a94a..91669aa51 100644 --- a/docs/examples/multi-post.c +++ b/docs/examples/multi-post.c @@ -28,7 +28,7 @@ int main(int argc, char *argv[]) struct curl_slist *headerlist=NULL; static const char buf[] = "Expect:"; - /* Fill in the file upload field. This makes libcurl load data from + /* Fill in the file upload field. This makes libcurl load data from the given file name when curl_easy_perform() is called. */ curl_formadd(&formpost, &lastptr, diff --git a/docs/examples/sampleconv.c b/docs/examples/sampleconv.c index 89cfb933e..8ed2b3b16 100644 --- a/docs/examples/sampleconv.c +++ b/docs/examples/sampleconv.c @@ -9,7 +9,7 @@ */ /* This is a simple example showing how a program on a non-ASCII platform - would invoke callbacks to do its own codeset conversions instead of + would invoke callbacks to do its own codeset conversions instead of using the built-in iconv functions in libcurl. The IBM-1047 EBCDIC codeset is used for this example but the code diff --git a/docs/libcurl/curl_easy_getinfo.3 b/docs/libcurl/curl_easy_getinfo.3 index 91fb9a760..7859d67c9 100644 --- a/docs/libcurl/curl_easy_getinfo.3 +++ b/docs/libcurl/curl_easy_getinfo.3 @@ -5,7 +5,7 @@ .\" * | (__| |_| | _ <| |___ .\" * \___|\___/|_| \_\_____| .\" * -.\" * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. +.\" * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. .\" * .\" * This software is licensed as described in the file COPYING, which .\" * you should have received as part of this distribution. The terms @@ -217,10 +217,10 @@ Applications wishing to resume an RTSP session on another connection should retreive this info before closing the active connection. .IP CURLINFO_RTSP_CLIENT_CSEQ Pass a pointer to a long to receive the next CSeq that will be used by the -application. +application. .IP CURLINFO_RTSP_SERVER_CSEQ Pass a pointer to a long to receive the next server CSeq that will be expected -by the application. +by the application. \fI(NOTE: listening for server initiated requests is currently unimplemented).\fP diff --git a/docs/libcurl/curl_easy_init.3 b/docs/libcurl/curl_easy_init.3 index 083633627..9b7ef2f1d 100644 --- a/docs/libcurl/curl_easy_init.3 +++ b/docs/libcurl/curl_easy_init.3 @@ -14,7 +14,7 @@ handle that you must use as input to other easy-functions. curl_easy_init initializes curl and this call \fBMUST\fP have a corresponding call to \fIcurl_easy_cleanup(3)\fP when the operation is complete. -If you did not already call \fIcurl_global_init(3)\fP, +If you did not already call \fIcurl_global_init(3)\fP, \fIcurl_easy_init(3)\fP does it automatically. This may be lethal in multi-threaded cases, since \fIcurl_global_init(3)\fP is not thread-safe, and it may result in resource problems because there is diff --git a/docs/libcurl/curl_easy_send.3 b/docs/libcurl/curl_easy_send.3 index 60a97b29d..30bb7ad1e 100644 --- a/docs/libcurl/curl_easy_send.3 +++ b/docs/libcurl/curl_easy_send.3 @@ -5,7 +5,7 @@ .\" * | (__| |_| | _ <| |___ .\" * \___|\___/|_| \_\_____| .\" * -.\" * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al. +.\" * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. .\" * .\" * This software is licensed as described in the file COPYING, which .\" * you should have received as part of this distribution. The terms @@ -23,7 +23,7 @@ .\" .TH curl_easy_send 3 "29 April 2008" "libcurl 7.18.2" "libcurl Manual" .SH NAME -curl_easy_send - sends raw data over an "easy" connection +curl_easy_send - sends raw data over an "easy" connection .SH SYNOPSIS .B #include <curl/easy.h> .sp diff --git a/docs/libcurl/curl_easy_setopt.3 b/docs/libcurl/curl_easy_setopt.3 index b7276af66..cbbbefe31 100644 --- a/docs/libcurl/curl_easy_setopt.3 +++ b/docs/libcurl/curl_easy_setopt.3 @@ -435,7 +435,7 @@ Therefore the (probably undefined) contents of the buffer is NOT copied by the library. You should keep the associated storage available until libcurl no longer needs it. Failing to do so will cause very odd behavior or even crashes. libcurl will need it until you call \fIcurl_easy_cleanup(3)\fP -or you set the same option again to use a different pointer. +or you set the same option again to use a different pointer. Use \fICURLOPT_VERBOSE\fP and \fICURLOPT_DEBUGFUNCTION\fP to better debug/trace why errors happen. diff --git a/docs/libcurl/curl_formadd.3 b/docs/libcurl/curl_formadd.3 index cf692ea52..906172227 100644 --- a/docs/libcurl/curl_formadd.3 +++ b/docs/libcurl/curl_formadd.3 @@ -152,7 +152,7 @@ to a CURL_FORMADD_* constant defined in /* Add simple name/content section */ curl_formadd(&post, &last, CURLFORM_COPYNAME, "name", - CURLFORM_COPYCONTENTS, "content", CURLFORM_END); + CURLFORM_COPYCONTENTS, "content", CURLFORM_END); /* Add simple name/content/contenttype section */ curl_formadd(&post, &last, CURLFORM_COPYNAME, "htmlcode", diff --git a/docs/libcurl/curl_formget.3 b/docs/libcurl/curl_formget.3 index 83996cbe0..999208112 100644 --- a/docs/libcurl/curl_formget.3 +++ b/docs/libcurl/curl_formget.3 @@ -22,7 +22,7 @@ passed to the curl_formget_callback function. The curl_formget_callback will be executed for each part of the HTTP POST chain. The void *arg pointer will be the one passed as second argument to -curl_formget(). The character buffer passed to it must not be freed. The +curl_formget(). The character buffer passed to it must not be freed. The callback should return the buffer length passed to it on success. .SH RETURN VALUE 0 means everything was ok, non-zero means an error occurred diff --git a/docs/libcurl/curl_free.3 b/docs/libcurl/curl_free.3 index faa1066d8..447259d4f 100644 --- a/docs/libcurl/curl_free.3 +++ b/docs/libcurl/curl_free.3 @@ -1,6 +1,6 @@ .\" You can view this file with: .\" nroff -man [file] -.\" $Id: +.\" $Id$ .\" .TH curl_free 3 "12 Aug 2003" "libcurl 7.10" "libcurl Manual" .SH NAME diff --git a/docs/libcurl/curl_multi_socket_action.3 b/docs/libcurl/curl_multi_socket_action.3 index 65eef4e3f..c155c7e60 100644 --- a/docs/libcurl/curl_multi_socket_action.3 +++ b/docs/libcurl/curl_multi_socket_action.3 @@ -7,7 +7,7 @@ curl_multi_socket_action \- reads/writes available data given an action .nf #include <curl/curl.h> -CURLMcode curl_multi_socket_action(CURLM * multi_handle, +CURLMcode curl_multi_socket_action(CURLM * multi_handle, curl_socket_t sockfd, int ev_bitmask, int *running_handles); .fi diff --git a/docs/libcurl/curl_share_setopt.3 b/docs/libcurl/curl_share_setopt.3 index 43d4b29c4..c3316cd24 100644 --- a/docs/libcurl/curl_share_setopt.3 +++ b/docs/libcurl/curl_share_setopt.3 @@ -48,7 +48,7 @@ be used! .RE .IP CURLSHOPT_UNSHARE This option does the opposite of \fICURLSHOPT_SHARE\fP. It specifies that -the specified \fIparameter\fP will no longer be shared. Valid values are +the specified \fIparameter\fP will no longer be shared. Valid values are the same as those for \fICURLSHOPT_SHARE\fP. .IP CURLSHOPT_USERDATA The \fIparameter\fP allows you to specify a pointer to data that will be passed diff --git a/docs/libcurl/libcurl-tutorial.3 b/docs/libcurl/libcurl-tutorial.3 index 497551633..b435c4bfc 100644 --- a/docs/libcurl/libcurl-tutorial.3 +++ b/docs/libcurl/libcurl-tutorial.3 @@ -5,7 +5,7 @@ .\" * | (__| |_| | _ <| |___ .\" * \___|\___/|_| \_\_____| .\" * -.\" * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. +.\" * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. .\" * .\" * This software is licensed as described in the file COPYING, which .\" * you should have received as part of this distribution. The terms @@ -273,7 +273,7 @@ GnuTLS http://www.gnu.org/software/gnutls/manual/html_node/Multi_002dthreaded-applications.html NSS - + is claimed to be thread-safe already without anything required. yassl @@ -391,7 +391,7 @@ another option for this, the CURLOPT_PROXYUSERPWD. It is used quite similar to the CURLOPT_USERPWD option like this: curl_easy_setopt(easyhandle, CURLOPT_PROXYUSERPWD, "myname:thesecret"); - + There's a long time UNIX "standard" way of storing ftp user names and passwords, namely in the $HOME/.netrc file. The file should be made private so that only the user may read it (see also the "Security Considerations" @@ -1200,7 +1200,7 @@ between requests. .IP "Dangerous URLs" SCP URLs can contain raw commands within the scp: URL, which is a side effect -of how the SCP protocol is designed. e.g. +of how the SCP protocol is designed. e.g. scp://user:pass@host/a;date >/tmp/test; Apps must not allow unsanitized SCP: URLs to be passed in for downloads. @@ -1223,7 +1223,7 @@ the CURLOPT_MAXFILESIZE_LARGE option is not sufficient to guard against this. Instead, the app should monitor the amount of data received within the write or progress callback and abort once the limit is reached. -A malicious HTTP server could cause an infinite redirection loop, causing a +A malicious HTTP server could cause an infinite redirection loop, causing a denial-of-service. This can be mitigated by using the CURLOPT_MAXREDIRS option. diff --git a/docs/libcurl/symbols-in-versions b/docs/libcurl/symbols-in-versions index 549753b7b..9cc6e5c0a 100644 --- a/docs/libcurl/symbols-in-versions +++ b/docs/libcurl/symbols-in-versions @@ -224,7 +224,7 @@ CURLOPT_FTPAPPEND 7.1 7.16.4 CURLOPT_FTPASCII 7.1 7.11.1 7.15.4 CURLOPT_FTPLISTONLY 7.1 7.16.4 CURLOPT_FTPPORT 7.1 -CURLOPT_FTPSSLAUTH 7.12.2 +CURLOPT_FTPSSLAUTH 7.12.2 CURLOPT_FTP_ACCOUNT 7.13.1 CURLOPT_FTP_ALTERNATIVE_TO_USER 7.15.5 CURLOPT_FTP_CREATE_MISSING_DIRS 7.10.7 diff --git a/include/README b/include/README index a75249f0a..f4cc18b44 100644 --- a/include/README +++ b/include/README @@ -1,7 +1,7 @@ - _ _ ____ _ - ___| | | | _ \| | - / __| | | | |_) | | - | (__| |_| | _ <| |___ + _ _ ____ _ + ___| | | | _ \| | + / __| | | | |_) | | + | (__| |_| | _ <| |___ \___|\___/|_| \_\_____| Include files for libcurl, external users. diff --git a/include/curl/curlrules.h b/include/curl/curlrules.h index 8e7096642..8aa6c5252 100644 --- a/include/curl/curlrules.h +++ b/include/curl/curlrules.h @@ -187,7 +187,7 @@ typedef char /* EXTERNALLY AND INTERNALLY VISIBLE DEFINITIONS */ /* ================================================================ */ -/* +/* * CURL_ISOCPP and CURL_OFF_T_C definitions are done here in order to allow * these to be visible and exported by the external libcurl interface API, * while also making them visible to the library internals, simply including diff --git a/include/curl/stdcheaders.h b/include/curl/stdcheaders.h index 0a1bcdad1..1ea70443f 100644 --- a/include/curl/stdcheaders.h +++ b/include/curl/stdcheaders.h @@ -1,18 +1,18 @@ #ifndef __STDC_HEADERS_H #define __STDC_HEADERS_H /*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms * are also available at http://curl.haxx.se/docs/copyright.html. - * + * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is * furnished to do so, under the terms of the COPYING file. @@ -31,4 +31,4 @@ size_t fwrite (const void *, size_t, size_t, FILE *); int strcasecmp(const char *, const char *); int strncasecmp(const char *, const char *, size_t); -#endif +#endif /* __STDC_HEADERS_H */ diff --git a/install-sh b/install-sh index e8436696c..a85c20295 100755 --- a/install-sh +++ b/install-sh @@ -124,7 +124,7 @@ if [ x"$dir_arg" != x ]; then else # Waiting for this to be detected by the "$instcmd $src $dsttmp" command -# might cause directories to be created, which would be especially bad +# might cause directories to be created, which would be especially bad # if $src (and thus $dsttmp) contains '*'. if [ -f $src -o -d $src ] @@ -201,17 +201,17 @@ else # If we're going to rename the final executable, determine the name now. - if [ x"$transformarg" = x ] + if [ x"$transformarg" = x ] then dstfile=`basename $dst` else - dstfile=`basename $dst $transformbasename | + dstfile=`basename $dst $transformbasename | sed $transformarg`$transformbasename fi # don't allow the sed command to completely eliminate the filename - if [ x"$dstfile" = x ] + if [ x"$dstfile" = x ] then dstfile=`basename $dst` else @@ -242,7 +242,7 @@ else # Now rename the file to the real destination. $doit $rmcmd -f $dstdir/$dstfile && - $doit $mvcmd $dsttmp $dstdir/$dstfile + $doit $mvcmd $dsttmp $dstdir/$dstfile fi && diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 372c86995..aec1a3c5b 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -57,7 +57,7 @@ if(HAVE_FEATURES_H) nonblock.c hash.c http.c - if2ip.c + if2ip.c mprintf.c multi.c sendf.c diff --git a/lib/Makefile.am b/lib/Makefile.am index 2140b30f4..42e80662e 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -95,7 +95,7 @@ endif # # Here's the simplified rule guide on how to change -version-info: # (current version is C:R:A) -# +# # 1. if there are only source changes, use C:R+1:A # 2. if interfaces were added use C+1:0:A+1 # 3. if interfaces were removed, then use C+1:0:0 diff --git a/lib/Makefile.riscos b/lib/Makefile.riscos index 56472aeb1..57475e4d0 100644 --- a/lib/Makefile.riscos +++ b/lib/Makefile.riscos @@ -20,7 +20,7 @@ objs = o.base64 o.connect o.cookie o.dict \ # Compile options: linkopts = -o libcurl -compileropts = -mpoke-function-name -IUtilLib: -mthrowback +compileropts = -mpoke-function-name -IUtilLib: -mthrowback # Project target: libcurl: $(objs) diff --git a/lib/Makefile.vxworks b/lib/Makefile.vxworks index a1f9f82ae..f58494f5f 100644 --- a/lib/Makefile.vxworks +++ b/lib/Makefile.vxworks @@ -43,14 +43,14 @@ ARES_LIB := # ---------------------------------------------------------------------- -# Compiler +# Compiler # ---------------------------------------------------------------------- CC := ccppc AR := arppc LINK := ccppc CFLAGS := -D__GNUC__ -D__ppc__ -msoft-float -fno-builtin -mcpu=604 -mlongcall -DCPU=PPC604 -D_GNU_TOOL -Wall -W -Winline $(USER_CFLAGS) -LDFLAGS := -nostdlib -Wl,-i -Wl,-X +LDFLAGS := -nostdlib -Wl,-i -Wl,-X INCLUDE_FLAG := -I C_DEBUGFLAG := -g C_OPTFLAG := -O2 diff --git a/lib/README.ares b/lib/README.ares index b94a16611..cf6a1206a 100644 --- a/lib/README.ares +++ b/lib/README.ares @@ -1,14 +1,14 @@ $Id$ - _ _ ____ _ - ___| | | | _ \| | - / __| | | | |_) | | - | (__| |_| | _ <| |___ + _ _ ____ _ + ___| | | | _ \| | + / __| | | | |_) | | + | (__| |_| | _ <| |___ \___|\___/|_| \_\_____| How To Build libcurl to Use c-ares For Asynch Name Resolves =========================================================== -c-ares: +c-ares: http://daniel.haxx.se/projects/c-ares/ NOTE diff --git a/lib/README.curlx b/lib/README.curlx index 13645cb42..582c43a8b 100644 --- a/lib/README.curlx +++ b/lib/README.curlx @@ -1,8 +1,8 @@ $Id$ - _ _ ____ _ - ___| | | | _ \| | - / __| | | | |_) | | - | (__| |_| | _ <| |___ + _ _ ____ _ + ___| | | | _ \| | + / __| | | | |_) | | + | (__| |_| | _ <| |___ \___|\___/|_| \_\_____| Source Code Functions Apps Might Use diff --git a/lib/README.encoding b/lib/README.encoding index 1666e239e..ca9b4ec55 100644 --- a/lib/README.encoding +++ b/lib/README.encoding @@ -1,7 +1,7 @@ Content Encoding Support for libcurl -* About content encodings: +* About content encodings: HTTP/1.1 [RFC 2616] specifies that a client may request that a server encode its response. This is usually used to compress a response using one of a set @@ -31,9 +31,9 @@ Gallagher, and support for the 'gzip' encoding was added by Dan Fandrich. * The libcurl interface: -To cause libcurl to request a content encoding use: +To cause libcurl to request a content encoding use: - curl_easy_setopt(curl, CURLOPT_ENCODING, <string>) + curl_easy_setopt(curl, CURLOPT_ENCODING, <string>) where <string> is the intended value of the Accept-Encoding header. diff --git a/lib/README.memoryleak b/lib/README.memoryleak index 8aa6094fd..0d2f37485 100644 --- a/lib/README.memoryleak +++ b/lib/README.memoryleak @@ -1,8 +1,8 @@ $Id$ - _ _ ____ _ - ___| | | | _ \| | - / __| | | | |_) | | - | (__| |_| | _ <| |___ + _ _ ____ _ + ___| | | | _ \| | + / __| | | | |_) | | + | (__| |_| | _ <| |___ \___|\___/|_| \_\_____| How To Track Down Suspected Memory Leaks in libcurl diff --git a/lib/arpa_telnet.h b/lib/arpa_telnet.h index edcfb596e..9c574ee15 100644 --- a/lib/arpa_telnet.h +++ b/lib/arpa_telnet.h @@ -1,18 +1,18 @@ -#ifndef __ARPA_TELNET_H -#define __ARPA_TELNET_H +#ifndef HEADER_CURL_ARPA_TELNET_H +#define HEADER_CURL_ARPA_TELNET_H /*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms * are also available at http://curl.haxx.se/docs/copyright.html. - * + * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is * furnished to do so, under the terms of the COPYING file. @@ -58,12 +58,12 @@ static const char * const telnetoptions[]= #define CURL_TELOPT_OK(x) ((x) <= CURL_TELOPT_MAXIMUM) #define CURL_TELOPT(x) telnetoptions[x] -#define CURL_NTELOPTS 40 +#define CURL_NTELOPTS 40 /* * First some defines */ -#define CURL_xEOF 236 /* End Of File */ +#define CURL_xEOF 236 /* End Of File */ #define CURL_SE 240 /* Sub negotiation End */ #define CURL_NOP 241 /* No OPeration */ #define CURL_DM 242 /* Data Mark */ @@ -97,5 +97,7 @@ static const char * const telnetcmds[]= #define CURL_TELCMD_OK(x) ( ((unsigned int)(x) >= CURL_TELCMD_MINIMUM) && \ ((unsigned int)(x) <= CURL_TELCMD_MAXIMUM) ) #define CURL_TELCMD(x) telnetcmds[(x)-CURL_TELCMD_MINIMUM] -#endif -#endif + +#endif /* CURL_DISABLE_TELNET */ + +#endif /* HEADER_CURL_ARPA_TELNET_H */ diff --git a/lib/curl_addrinfo.h b/lib/curl_addrinfo.h index a7235039f..cf7470370 100644 --- a/lib/curl_addrinfo.h +++ b/lib/curl_addrinfo.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -45,7 +45,7 @@ #endif -/* +/* * Curl_addrinfo is our internal struct definition that we use to allow * consistent internal handling of this data. We use this even when the * system provides an addrinfo structure definition. And we use this for diff --git a/lib/curl_md5.h b/lib/curl_md5.h index 19c34fb4d..e4da02e7f 100644 --- a/lib/curl_md5.h +++ b/lib/curl_md5.h @@ -1,18 +1,18 @@ -#ifndef __CURL_MD5_H -#define __CURL_MD5_H +#ifndef HEADER_CURL_MD5_H +#define HEADER_CURL_MD5_H /*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms * are also available at http://curl.haxx.se/docs/copyright.html. - * + * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is * furnished to do so, under the terms of the COPYING file. @@ -26,4 +26,4 @@ void Curl_md5it(unsigned char *output, const unsigned char *input); -#endif +#endif /* HEADER_CURL_MD5_H */ diff --git a/lib/curl_sspi.h b/lib/curl_sspi.h index 87aa380fc..454742117 100644 --- a/lib/curl_sspi.h +++ b/lib/curl_sspi.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -29,7 +29,7 @@ #include <curl/curl.h> -/* +/* * When including the folowing three headers, it is mandatory to define either * SECURITY_WIN32 or SECURITY_KERNEL, indicating who is compiling the code. */ diff --git a/lib/curl_threads.c b/lib/curl_threads.c index 96304e440..3c3eecd02 100644 --- a/lib/curl_threads.c +++ b/lib/curl_threads.c @@ -45,7 +45,7 @@ struct curl_actual_call { unsigned int (*func)(void *); - void *arg; + void *arg; }; static void *curl_thread_create_thunk(void *arg) diff --git a/lib/firefox-db2pem.sh b/lib/firefox-db2pem.sh index 11f641c91..202549160 100755 --- a/lib/firefox-db2pem.sh +++ b/lib/firefox-db2pem.sh @@ -6,7 +6,7 @@ # * | (__| |_| | _ <| |___ # * \___|\___/|_| \_\_____| # * -# * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al. +# * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. # * # * This software is licensed as described in the file COPYING, which # * you should have received as part of this distribution. The terms @@ -21,11 +21,11 @@ # * # * $Id$ # *************************************************************************** -# This shell script creates a fresh ca-bundle.crt file for use with libcurl. +# This shell script creates a fresh ca-bundle.crt file for use with libcurl. # It extracts all ca certs it finds in the local Firefox database and converts # them all into PEM format. # -db=`ls -1d $HOME/.mozilla/firefox/*default` +db=`ls -1d $HOME/.mozilla/firefox/*default` out=$1 if test -z "$out"; then diff --git a/lib/getinfo.h b/lib/getinfo.h index 75f556bfc..ca06551ae 100644 --- a/lib/getinfo.h +++ b/lib/getinfo.h @@ -1,18 +1,18 @@ -#ifndef __GETINFO_H -#define __GETINFO_H +#ifndef HEADER_CURL_GETINFO_H +#define HEADER_CURL_GETINFO_H /*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms * are also available at http://curl.haxx.se/docs/copyright.html. - * + * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is * furnished to do so, under the terms of the COPYING file. @@ -25,4 +25,4 @@ CURLcode Curl_getinfo(struct SessionHandle *data, CURLINFO info, ...); CURLcode Curl_initinfo(struct SessionHandle *data); -#endif +#endif /* HEADER_CURL_GETINFO_H */ diff --git a/lib/hostip4.c b/lib/hostip4.c index 3e5a12d2b..68e589a33 100644 --- a/lib/hostip4.c +++ b/lib/hostip4.c @@ -121,7 +121,7 @@ Curl_addrinfo *Curl_getaddrinfo(struct connectdata *conn, if(!ai) infof(conn->data, "Curl_ipv4_resolve_r failed for %s\n", hostname); - return ai; + return ai; } #endif /* CURLRES_SYNCH */ #endif /* CURLRES_IPV4 */ @@ -149,7 +149,7 @@ Curl_addrinfo *Curl_ipv4_resolve_r(const char *hostname, return Curl_ip2addr(AF_INET, &in, hostname, port); #if defined(HAVE_GETADDRINFO_THREADSAFE) - else { + else { struct addrinfo hints; char sbuf[NI_MAXSERV]; char *sbufptr = NULL; diff --git a/lib/http_negotiate.h b/lib/http_negotiate.h index 669fee586..a5dec7092 100644 --- a/lib/http_negotiate.h +++ b/lib/http_negotiate.h @@ -1,19 +1,18 @@ -#ifndef __HTTP_NEGOTIATE_H -#define __HTTP_NEGOTIATE_H - +#ifndef HEADER_CURL_HTTP_NEGOTIATE_H +#define HEADER_CURL_HTTP_NEGOTIATE_H /*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2004, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms * are also available at http://curl.haxx.se/docs/copyright.html. - * + * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is * furnished to do so, under the terms of the COPYING file. @@ -27,13 +26,14 @@ #ifdef HAVE_GSSAPI /* this is for Negotiate header input */ -int Curl_input_negotiate(struct connectdata *conn, bool proxy, const char *header); +int Curl_input_negotiate(struct connectdata *conn, bool proxy, + const char *header); /* this is for creating Negotiate header output */ CURLcode Curl_output_negotiate(struct connectdata *conn, bool proxy); void Curl_cleanup_negotiate(struct SessionHandle *data); -#endif +#endif /* HAVE_GSSAPI */ -#endif +#endif /* HEADER_CURL_HTTP_NEGOTIATE_H */ diff --git a/lib/mk-ca-bundle.pl b/lib/mk-ca-bundle.pl index 24c892ca7..99a096a09 100755 --- a/lib/mk-ca-bundle.pl +++ b/lib/mk-ca-bundle.pl @@ -6,7 +6,7 @@ # * | (__| |_| | _ <| |___ # * \___|\___/|_| \_\_____| # * -# * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al. +# * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. # * # * This software is licensed as described in the file COPYING, which # * you should have received as part of this distribution. The terms @@ -21,7 +21,7 @@ # * # * $Id$ # *************************************************************************** -# This Perl script creates a fresh ca-bundle.crt file for use with libcurl. +# This Perl script creates a fresh ca-bundle.crt file for use with libcurl. # It downloads certdata.txt from Mozilla's source tree (see URL below), # then parses certdata.txt and extracts CA Root Certificates into PEM format. # These are then processed with the OpenSSL commandline tool to produce the @@ -35,7 +35,7 @@ use Getopt::Std; use MIME::Base64; use LWP::UserAgent; use strict; -use vars qw($opt_b $opt_h $opt_i $opt_l $opt_n $opt_q $opt_t $opt_u $opt_v); +use vars qw($opt_b $opt_h $opt_i $opt_l $opt_n $opt_q $opt_t $opt_u $opt_v); my $url = 'http://mxr.mozilla.org/seamonkey/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1'; # If the OpenSSL commandline is not in search path you can configure it here! diff --git a/lib/netrc.c b/lib/netrc.c index a5dc8f408..2b41946d5 100644 --- a/lib/netrc.c +++ b/lib/netrc.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -145,7 +145,7 @@ int Curl_parsenetrc(const char *host, bool done=FALSE; char netrcbuffer[256]; int netrcbuffsize = (int)sizeof(netrcbuffer); - + while(!done && fgets(netrcbuffer, netrcbuffsize, file)) { tok=strtok_r(netrcbuffer, " \t\n", &tok_buf); while(!done && tok) { diff --git a/lib/netrc.h b/lib/netrc.h index a82b3fc35..e6df41941 100644 --- a/lib/netrc.h +++ b/lib/netrc.h @@ -1,18 +1,18 @@ -#ifndef __NETRC_H -#define __NETRC_H +#ifndef HEADER_CURL_NETRC_H +#define HEADER_CURL_NETRC_H /*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2004, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms * are also available at http://curl.haxx.se/docs/copyright.html. - * + * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is * furnished to do so, under the terms of the COPYING file. @@ -31,4 +31,5 @@ int Curl_parsenetrc(const char *host, * in the netrc. * If login[0] != 0, search for password within machine and login. */ -#endif + +#endif /* HEADER_CURL_NETRC_H */ diff --git a/lib/setup-os400.h b/lib/setup-os400.h index 636ee7fa2..6ac96b992 100644 --- a/lib/setup-os400.h +++ b/lib/setup-os400.h @@ -1,5 +1,5 @@ -#ifndef __SETUP_OS400_H -#define __SETUP_OS400_H +#ifndef HEADER_CURL_SETUP_OS400_H +#define HEADER_CURL_SETUP_OS400_H /*************************************************************************** * _ _ ____ _ * Project ___| | | | _ \| | @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -94,7 +94,7 @@ extern OM_uint32 Curl_gss_init_sec_context_a(OM_uint32 * minor_status, gss_flags_t req_flags, OM_uint32 time_req, gss_channel_bindings_t - input_chan_bindings, + input_chan_bindings, gss_buffer_t input_token, gss_OID * actual_mech_type, gss_buffer_t output_token, @@ -138,4 +138,4 @@ extern int Curl_os400_recvfrom(int sd, char * buffer, int buflen, int flags, #define recvfrom Curl_os400_recvfrom -#endif /* __SETUP_OS400_H */ +#endif /* HEADER_CURL_SETUP_OS400_H */ diff --git a/lib/setup.h b/lib/setup.h index ced3face5..6c19cbcda 100644 --- a/lib/setup.h +++ b/lib/setup.h @@ -1,5 +1,5 @@ -#ifndef __LIB_CURL_SETUP_H -#define __LIB_CURL_SETUP_H +#ifndef HEADER_CURL_LIB_SETUP_H +#define HEADER_CURL_LIB_SETUP_H /*************************************************************************** * _ _ ____ _ * Project ___| | | | _ \| | @@ -549,4 +549,4 @@ int netware_init(void); #include "setup_once.h" #endif -#endif /* __LIB_CURL_SETUP_H */ +#endif /* HEADER_CURL_LIB_SETUP_H */ diff --git a/lib/speedcheck.h b/lib/speedcheck.h index fda964c9e..2789e8c5a 100644 --- a/lib/speedcheck.h +++ b/lib/speedcheck.h @@ -1,18 +1,18 @@ -#ifndef __SPEEDCHECK_H -#define __SPEEDCHECK_H +#ifndef HEADER_CURL_SPEEDCHECK_H +#define HEADER_CURL_SPEEDCHECK_H /*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms * are also available at http://curl.haxx.se/docs/copyright.html. - * + * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is * furnished to do so, under the terms of the COPYING file. @@ -31,4 +31,4 @@ void Curl_speedinit(struct SessionHandle *data); CURLcode Curl_speedcheck(struct SessionHandle *data, struct timeval now); -#endif +#endif /* HEADER_CURL_SPEEDCHECK_H */ diff --git a/lib/strdup.h b/lib/strdup.h index 07681ac12..51886bd09 100644 --- a/lib/strdup.h +++ b/lib/strdup.h @@ -1,18 +1,18 @@ -#ifndef __CURL_STRDUP_H -#define __CURL_STRDUP_H +#ifndef HEADER_CURL_STRDUP_H +#define HEADER_CURL_STRDUP_H /*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms * are also available at http://curl.haxx.se/docs/copyright.html. - * + * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is * furnished to do so, under the terms of the COPYING file. @@ -28,5 +28,4 @@ extern char *curlx_strdup(const char *str); #endif -#endif - +#endif /* HEADER_CURL_STRDUP_H */ diff --git a/lib/strtok.h b/lib/strtok.h index 8cb8e694f..6380e4327 100644 --- a/lib/strtok.h +++ b/lib/strtok.h @@ -1,18 +1,18 @@ -#ifndef __CURL_STRTOK_H -#define __CURL_STRTOK_H +#ifndef HEADER_CURL_STRTOK_H +#define HEADER_CURL_STRTOK_H /*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms * are also available at http://curl.haxx.se/docs/copyright.html. - * + * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is * furnished to do so, under the terms of the COPYING file. @@ -32,5 +32,4 @@ char *Curl_strtok_r(char *s, const char *delim, char **last); #include <string.h> #endif -#endif - +#endif /* HEADER_CURL_STRTOK_H */ diff --git a/lib/strtoofft.h b/lib/strtoofft.h index 6d7a14930..82f25fe56 100644 --- a/lib/strtoofft.h +++ b/lib/strtoofft.h @@ -1,5 +1,5 @@ -#ifndef _CURL_STRTOOFFT_H -#define _CURL_STRTOOFFT_H +#ifndef HEADER_CURL_STRTOOFFT_H +#define HEADER_CURL_STRTOOFFT_H /*************************************************************************** * _ _ ____ _ * Project ___| | | | _ \| | @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -30,7 +30,7 @@ * to implement string conversion to our curl_off_t integral data type. * * Notice that curl_off_t might be 64 or 32 bit wide, and that it might use - * an undelying data type which might be 'long', 'int64_t', 'long long' or + * an undelying data type which might be 'long', 'int64_t', 'long long' or * '__int64' and more remotely other data types. * * On systems where the size of curl_off_t is greater than the size of 'long' @@ -61,5 +61,4 @@ #define CURL_LLONG_MAX CURL_OFF_T_C(0x7FFFFFFFFFFFFFFF) #define CURL_LLONG_MIN (-CURL_LLONG_MAX - CURL_OFF_T_C(1)) -#endif - +#endif /* HEADER_CURL_STRTOOFFT_H */ @@ -9,7 +9,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -61,7 +61,7 @@ sed -e 's/^#define LIBCURL_VERSION .*/#define LIBCURL_VERSION "'$libversion'"/g' # Replace version number in header file: sed 's/#define CURL_VERSION .*/#define CURL_VERSION "'$curlversion'"/g' $CHEADER >$CHEADER.dist -# Generate VC8 and VC9 versions from the VC6 Makefile versions +# Generate VC8 and VC9 versions from the VC6 Makefile versions for ver in vc8 vc9; do make -f Makefile.dist $ver mv src/Makefile.$ver src/Makefile.$ver.dist diff --git a/packages/AIX/RPM/README b/packages/AIX/RPM/README index 348cb8582..f5e0f68b8 100644 --- a/packages/AIX/RPM/README +++ b/packages/AIX/RPM/README @@ -12,22 +12,22 @@ The spec file in this directory is based on the Linux ssl and non-ssl curl spec files, plus additions to make it AIX Toolbox compatible. The AIX Toolbox setup (installs into /opt/freeware, with symlinks in -/usr/bin,/usr/lib,/usr/include) are based on IBM's aixtoolbox spec +/usr/bin,/usr/lib,/usr/include) are based on IBM's aixtoolbox spec file written by David Clissold <cliss@austin.ibm.com>, see ftp://ftp.software.ibm.com/aixtoolbox/SPECS/curl-7.9.3-2.spec This spec file is designed to be a drop-in replacement for the -old spec file found at the above link. Thus, like the old spec file -this version is also a unified ssl/non-ssl version. To get non-ssl -RPMs just pass --define 'nossl 1' to the command line when building -the RPM, e.g. +old spec file found at the above link. Thus, like the old spec file +this version is also a unified ssl/non-ssl version. To get non-ssl +RPMs just pass --define 'nossl 1' to the command line when building +the RPM, e.g. rpm -bb --define 'nossl 1' curl.spec Default is to build with ssl support. -Lastly, the spec file expects the Curl source distribution file to be +Lastly, the spec file expects the Curl source distribution file to be in .tar.bz2 format. The nifty cURL header of this README is a ripoff of the vms/readme file. diff --git a/packages/AIX/RPM/curl.spec.in b/packages/AIX/RPM/curl.spec.in index 766b0f304..a37e0d7ca 100644 --- a/packages/AIX/RPM/curl.spec.in +++ b/packages/AIX/RPM/curl.spec.in @@ -38,14 +38,14 @@ Note: this version is compiled without SSL support. %package devel Summary: Development files for the curl libary Group: Development/Libraries -%if %{SSL} == 1 -Requires: openssl >= 0.9.5 -%endif +%if %{SSL} == 1 +Requires: openssl >= 0.9.5 +%endif Requires: curl = %{version} Provides: curl-devel %description devel -libcurl is the core engine of curl; this packages contains all the +libcurl is the core engine of curl; this packages contains all the libs, headers, and manual pages to develop applications using libcurl. %define DEFCC xlc @@ -61,7 +61,7 @@ if [[ -z "$CC" ]] then if test "X`type %{DEFCC} 2>/dev/null`" != 'X'; then export CC=%{DEFCC} - else + else export CC=gcc fi fi @@ -109,9 +109,9 @@ make DESTDIR=%{buildroot} install-strip %if %{SSL} == 1 %{_datadir}/curl/curl-ca-bundle.crt %endif -%doc CHANGES COPYING README RELEASE-NOTES +%doc CHANGES COPYING README RELEASE-NOTES %doc docs/BUGS docs/CONTRIBUTE docs/FAQ docs/FEATURES docs/HISTORY -%doc docs/INSTALL docs/KNOWN_BUGS +%doc docs/INSTALL docs/KNOWN_BUGS %doc docs/MANUAL docs/RESOURCES docs/THANKS docs/VERSIONS docs/TODO %doc docs/TheArtOfHttpScripting %if %{SSL} == 1 diff --git a/packages/Linux/RPM/curl-ssl.spec.in b/packages/Linux/RPM/curl-ssl.spec.in index d953b3960..7f290ba21 100644 --- a/packages/Linux/RPM/curl-ssl.spec.in +++ b/packages/Linux/RPM/curl-ssl.spec.in @@ -40,13 +40,13 @@ headers, and manual pages to develop applications using libcurl. %prep -%setup -q -n %{tarball}-%{version} +%setup -q -n %{tarball}-%{version} %build cd %{curlroot} && (if [ -f configure.in ]; then mv -f configure.in configure.in.rpm; fi) %configure cd %{curlroot} && (if [ -f configure.in.rpm ]; then mv -f configure.in.rpm configure.in; fi) -make +make %install [ "%{buildroot}" != "/" ] && rm -rf %{buildroot} diff --git a/packages/Linux/RPM/curl.spec.in b/packages/Linux/RPM/curl.spec.in index 8b81726b7..2382f578d 100644 --- a/packages/Linux/RPM/curl.spec.in +++ b/packages/Linux/RPM/curl.spec.in @@ -42,7 +42,7 @@ rm -rf %{builddir} %build %configure --without-ssl --prefix=%{prefix} -make +make %install rm -rf $RPM_BUILD_ROOT diff --git a/packages/Makefile.am b/packages/Makefile.am index 88fed435a..e211c0a3f 100644 --- a/packages/Makefile.am +++ b/packages/Makefile.am @@ -28,5 +28,5 @@ EXTRA_DIST = README \ Symbian/readme.txt \ TPF/curl.mak \ TPF/maketpf.env_curl \ - TPF/maketpf.env_curllib + TPF/maketpf.env_curllib diff --git a/packages/README b/packages/README index cb50b4018..2487d95d0 100644 --- a/packages/README +++ b/packages/README @@ -1,7 +1,7 @@ - _ _ ____ _ - ___| | | | _ \| | - / __| | | | |_) | | - | (__| |_| | _ <| |___ + _ _ ____ _ + ___| | | | _ \| | + / __| | | | |_) | | + | (__| |_| | _ <| |___ \___|\___/|_| \_\_____| PACKAGES @@ -14,14 +14,14 @@ of those custom formats. The hierarchy for these directories is something like this: packages/[OS]/[FORMAT]/ - + Currently, we have Win32 and Linux for [OS]. There might be different formats for the same OS so for Linux we have RPM as format. We might need to add some differentiation for CPU as well, as there is Linux-RPMs for several CPUs. However, it might not be necessary since the packaging should be pretty much the same no matter what CPU that is used. - + For each unique OS-FORMAT pair, there's a directory to "fill"! I'd like to see a single README with as much details as possible, and then I'd like some template files for the package process. diff --git a/packages/Symbian/group/curl.iby b/packages/Symbian/group/curl.iby index f05bff3b8..7921aaa07 100644 --- a/packages/Symbian/group/curl.iby +++ b/packages/Symbian/group/curl.iby @@ -1,8 +1,8 @@ -// +// // curl file transfer utility command-line utility // // Use this file with buildrom to add curl to a device ROM -// +// #ifndef CURL_IBY #define CURL_IBY diff --git a/packages/Symbian/group/libcurl.mmp b/packages/Symbian/group/libcurl.mmp index cac26d5a8..512ff97ae 100644 --- a/packages/Symbian/group/libcurl.mmp +++ b/packages/Symbian/group/libcurl.mmp @@ -38,7 +38,7 @@ USERINCLUDE ../../../lib ../../../include/curl #ifdef ENABLE_SSL USERINCLUDE /epoc32/include/osextensions/stdapis // Older versions of the SDK need this instead: -//USERINCLUDE /epoc32/include/stdapis/openssl +//USERINCLUDE /epoc32/include/stdapis/openssl #endif SYSTEMINCLUDE ../../../include /epoc32/include/stdapis /epoc32/include diff --git a/packages/Symbian/readme.txt b/packages/Symbian/readme.txt index 840447b5d..05834e7b1 100644 --- a/packages/Symbian/readme.txt +++ b/packages/Symbian/readme.txt @@ -9,7 +9,7 @@ from client applications as well as creating a GUI application to allow file transfers. The author has no current plans to do so. This means that integration with standard Symbian OS programs can be -tricky, since libcurl isn't designed with Symbian's native asynchronous +tricky, since libcurl isn't designed with Symbian's native asynchronous message passing idioms in mind. However, it may be possible to use libcurl in an active object-based application through libcurl's multi interface. The port is most easily used when porting POSIX applications to Symbian diff --git a/packages/TPF/maketpf.env_curl b/packages/TPF/maketpf.env_curl index fd9a90f28..91a2573a1 100644 --- a/packages/TPF/maketpf.env_curl +++ b/packages/TPF/maketpf.env_curl @@ -6,7 +6,8 @@ ################################################################################ # Define the directories where the shared objects reside -################################################################################ +################################################################################ + ROOTLIBDIRS := $(foreach d,$(TPF_ROOT),$d/opensource/curl/output/lib) ################################################################################ diff --git a/packages/TPF/maketpf.env_curllib b/packages/TPF/maketpf.env_curllib index 8a9ad9f0a..f6ad5ba9d 100644 --- a/packages/TPF/maketpf.env_curllib +++ b/packages/TPF/maketpf.env_curllib @@ -6,19 +6,21 @@ ################################################################################ # Define the directories where the shared objects reside -################################################################################ +################################################################################ + ROOTLIBDIRS := $(foreach d,$(TPF_ROOT),$d/opensource/curl/output/lib) ################################################################################ -# Define the directories where the loadables (XXXXVV) are to be written +# Define the directories where the loadables (XXXXVV) are to be written ################################################################################ ROOTLOADDIRS := $(foreach d,$(TPF_ROOT),$d/opensource/curl/output/load) ################################################################################ # Define the location of the export files used by the LD postprocessor -# - currently expected that .exp files will also live in lib dir -################################################################################ +# - currently expected that .exp files will also live in lib dir +################################################################################ + ROOTEXPDIRS := $(foreach d,$(TPF_ROOT_LM),$d/opensource/curl/output/exp) ################################################################################ diff --git a/packages/Win32/cygwin/Makefile.am b/packages/Win32/cygwin/Makefile.am index 936f1b59f..b56148dc9 100644 --- a/packages/Win32/cygwin/Makefile.am +++ b/packages/Win32/cygwin/Makefile.am @@ -6,7 +6,7 @@ EXTRA_DIST = README # Read the README file for details on using this Makefile # # NOTE: As I'm not particularly familiar with Makefiles, this was the -# best I could come up with. It should probably be enhanced someday +# best I could come up with. It should probably be enhanced someday # to actually use the correct target and pre-requisite names, etc... # If anyone else wants to volunteer, feel free ;-) # diff --git a/packages/Win32/cygwin/README b/packages/Win32/cygwin/README index 313daccbe..7457f7397 100644 --- a/packages/Win32/cygwin/README +++ b/packages/Win32/cygwin/README @@ -1,7 +1,7 @@ -Curl is a tool for transferring files with URL syntax, supporting +Curl is a tool for transferring files with URL syntax, supporting FTP, FTPS, HTTP, HTTPS, TELNET, DICT, FILE and LDAP. - Curl supports HTTPS certificates, HTTP POST, HTTP PUT, - FTP uploading, kerberos, HTTP form based upload, proxies, + Curl supports HTTPS certificates, HTTP POST, HTTP PUT, + FTP uploading, kerberos, HTTP form based upload, proxies, cookies, user+password authentication, file transfer resume, http proxy tunneling and a busload of other useful tricks. @@ -43,7 +43,7 @@ Build Instructions (to recompile from the cygwin source tarball): http://mail.gnu.org/pipermail/libtool/2001-September/005549.html The copy of ltmain.sh that is distributed with cURL includes this patch. - As of curl 7.9.1, the official source compiles (under Cygwin) and tests + As of curl 7.9.1, the official source compiles (under Cygwin) and tests 100% cleanly OOTB (Out Of The Box) ---NO SSL RELEASE--- @@ -63,7 +63,7 @@ Packaging Instructions: where n is the cygwin release number (e.g. the "1" in curl-7.9-1), and "CYGBUILD=n" is optional (n defaults to 1 if not specified) - + Assuming everything worked, you'll find your binary tarballs in $(buildtop)/packages/Win32/cygwin/ @@ -77,8 +77,8 @@ Packaging Instructions: $ cd curl-7.9-1; mkdir CYGWIN-PATCHES $ cp packages/Win32/cygwin/README CYGWIN-PATCHES/curl-7.9-1.README 4. if applicable, document any changes in the README file - 5. create a patch which, when applied - (using `patch -p1 < curl-7.9-$(REL).patch`) + 5. create a patch which, when applied + (using `patch -p1 < curl-7.9-$(REL).patch`) will remove any changes you've made to the pristine source: $ cd .. $ diff -Nrup curl-7.9-1 curl-7.9 > curl-7.9-1.patch @@ -91,9 +91,9 @@ Packaging Instructions: @ curl sdesc: "a client that groks URLs" ldesc: "Curl is a tool for transferring files with URL syntax, - supporting FTP, FTPS, HTTP, HTTPS, TELNET, DICT, FILE - and LDAP. Curl supports HTTPS certificates, HTTP POST, HTTP PUT, - FTP uploading, kerberos, HTTP form based upload, proxies, + supporting FTP, FTPS, HTTP, HTTPS, TELNET, DICT, FILE + and LDAP. Curl supports HTTPS certificates, HTTP POST, HTTP PUT, + FTP uploading, kerberos, HTTP form based upload, proxies, cookies, user+password authentication, file transfer resume, http proxy tunneling and a busload of other useful tricks." category: Web Libs diff --git a/packages/vms/build_vms.com b/packages/vms/build_vms.com index 92df84e51..00b55d3d6 100755 --- a/packages/vms/build_vms.com +++ b/packages/vms/build_vms.com @@ -1,5 +1,5 @@ $! $Id$ -$! BUILD_VMS.COM +$! BUILD_VMS.COM $! $! I've taken the original build_vms.com, supplied by Nico Baggus, if $! memory serves me correctly, and made some modifications. @@ -45,11 +45,11 @@ $! 29-JAN-2004, MSK, moved logical defines into defines.com $! 6-FEB-2004, MSK, put in various SSL support bits $! 9-MAR-2004, MSK, the config-vms.h* files are now copied to the lib and $! src directories as curl_config.h. -$! 15-MAR-2004, MSK, All of the curlmsg*.* files have also been moved to -$! this build directory. They will be copied to the src -$! directory before build. The .msg file will be compiled -$! to get the .obj for messages, but the .h and .sdl files -$! are not automatically created since they partly rely on +$! 15-MAR-2004, MSK, All of the curlmsg*.* files have also been moved to +$! this build directory. They will be copied to the src +$! directory before build. The .msg file will be compiled +$! to get the .obj for messages, but the .h and .sdl files +$! are not automatically created since they partly rely on $! the freeware SDL tool. $! 8-FEB-2005, MSK, merged the two config-vms.h* files into one that uses $! USE_SSLEAY to define if the target has SSL support built @@ -95,7 +95,7 @@ $ orig_def = f$environment( "DEFAULT") $ on error then goto Common_Exit $ on control_y then goto Common_Exit $! -$ ctrl_y = 1556 +$ ctrl_y = 1556 $ proc = f$environment( "PROCEDURE") $ proc_dev_dir = - f$parse( proc, , , "DEVICE")+ f$parse( proc, , , "DIRECTORY") @@ -467,8 +467,8 @@ $ link 'link_qual' /executable = 'exedir'CURL.EXE - $! $ goto Common_Exit $! -$! Subroutine to build everything with a filetype passed in via P2 in -$! the directory passed in via P1 and put it in the object library named +$! Subroutine to build everything with a filetype passed in via P2 in +$! the directory passed in via P1 and put it in the object library named $! via P3. Exclude items in P4. $! $build: subroutine @@ -533,7 +533,7 @@ $ set default 'build_def' $ exit 'sts' $ endsubroutine ! Build $! -$! Based on the file TYPE, do the right compile command. +$! Based on the file TYPE, do the right compile command. $! Only C and MSG supported. $! $compile: subroutine diff --git a/packages/vms/config-vms.h b/packages/vms/config-vms.h index 85eaf6bfc..b7da92f59 100644 --- a/packages/vms/config-vms.h +++ b/packages/vms/config-vms.h @@ -205,7 +205,7 @@ #define HAVE_SYS_TYPES_H 1 /* Define if you have the <termios.h> header file. */ -#undef HAVE_TERMIOS_H +#undef HAVE_TERMIOS_H /* Define if you have the <time.h> header file. */ #define HAVE_TIME_H 1 diff --git a/packages/vms/curlmsg.h b/packages/vms/curlmsg.h index 99d5042a0..08da68a8a 100644 --- a/packages/vms/curlmsg.h +++ b/packages/vms/curlmsg.h @@ -114,7 +114,7 @@ #define CURL_SSL_CRL_BADFILE 251757210 #define CURL_SSL_ISSUER_ERROR 251757218 #define CURL_CURL_LAST 251757226 - + #pragma __member_alignment __restore #endif /* HEADER_CURLMSG_H */ diff --git a/packages/vms/curlmsg.msg b/packages/vms/curlmsg.msg index 93b3d7546..3765167f4 100644 --- a/packages/vms/curlmsg.msg +++ b/packages/vms/curlmsg.msg @@ -1,22 +1,22 @@ ! $Id$ -! -! These VMS error codes are generated by taking apart the curl.h -! file and putting all the CURLE_* enum stuff into this file, -! CURLMSG.MSG. An .SDL file is created from this file with +! +! These VMS error codes are generated by taking apart the curl.h +! file and putting all the CURLE_* enum stuff into this file, +! CURLMSG.MSG. An .SDL file is created from this file with ! MESSAGE/SDL. The .H file is created using the freeware SDL tool ! against the .SDL file with SDL/ALPHA/LANG=CC command. ! -! With the exception of CURLE_OK, all of the messages are at -! the error severity level. With the exception of -! PEER_FAILED_VERIF, which is a shortened form of -! PEER_FAILED_VERIFICATION, these are the same names as the +! With the exception of CURLE_OK, all of the messages are at +! the error severity level. With the exception of +! PEER_FAILED_VERIF, which is a shortened form of +! PEER_FAILED_VERIFICATION, these are the same names as the ! CURLE_ ones in include/curl.h. The Message Utility manual states -! "The combined length of the prefix and the message symbol name cannot +! "The combined length of the prefix and the message symbol name cannot ! exceed 31 characters." With a prefix of five that leaves us with 26 ! for the message name. -! +! ! If you update this file also update curlmsg_vms.h so that they are in sync -! +! .TITLE CURLMSG Message files .FACILITY CURL,1793 /PREFIX=CURL_ .BASE 1 diff --git a/packages/vms/curlmsg.sdl b/packages/vms/curlmsg.sdl index 42a7e8cc8..e192c0750 100644 --- a/packages/vms/curlmsg.sdl +++ b/packages/vms/curlmsg.sdl @@ -1,29 +1,29 @@ - + MODULE $CURDEF; - + /* /* This SDL File Generated by VAX-11 Message V04-00 on 3-SEP-2008 13:33:54.09 /* /* $ID: CURLMSG.MSG,V 1.7 2008-05-30 23:51:09 CURLVMS EXP $ -/* -/* THESE VMS ERROR CODES ARE GENERATED BY TAKING APART THE CURL.H -/* FILE AND PUTTING ALL THE CURLE_* ENUM STUFF INTO THIS FILE, -/* CURLMSG.MSG. AN .SDL FILE IS CREATED FROM THIS FILE WITH +/* +/* THESE VMS ERROR CODES ARE GENERATED BY TAKING APART THE CURL.H +/* FILE AND PUTTING ALL THE CURLE_* ENUM STUFF INTO THIS FILE, +/* CURLMSG.MSG. AN .SDL FILE IS CREATED FROM THIS FILE WITH /* MESSAGE/SDL. THE .H FILE IS CREATED USING THE FREEWARE SDL TOOL /* AGAINST THE .SDL FILE WITH SDL/ALPHA/LANG=CC COMMAND. /* -/* WITH THE EXCEPTION OF CURLE_OK, ALL OF THE MESSAGES ARE AT -/* THE ERROR SEVERITY LEVEL. WITH THE EXCEPTION OF -/* PEER_FAILED_VERIF, WHICH IS A SHORTENED FORM OF -/* PEER_FAILED_VERIFICATION, THESE ARE THE SAME NAMES AS THE +/* WITH THE EXCEPTION OF CURLE_OK, ALL OF THE MESSAGES ARE AT +/* THE ERROR SEVERITY LEVEL. WITH THE EXCEPTION OF +/* PEER_FAILED_VERIF, WHICH IS A SHORTENED FORM OF +/* PEER_FAILED_VERIFICATION, THESE ARE THE SAME NAMES AS THE /* CURLE_ ONES IN INCLUDE/CURL.H. THE MESSAGE UTILITY MANUAL STATES -/* "THE COMBINED LENGTH OF THE PREFIX AND THE MESSAGE SYMBOL NAME CANNOT +/* "THE COMBINED LENGTH OF THE PREFIX AND THE MESSAGE SYMBOL NAME CANNOT /* EXCEED 31 CHARACTERS." WITH A PREFIX OF FIVE THAT LEAVES US WITH 26 /* FOR THE MESSAGE NAME. -/* +/* /* IF YOU UPDATE THIS FILE ALSO UPDATE CURLMSG_VMS.H SO THAT THEY ARE IN SYNC -/* +/* CONSTANT "FACILITY" EQUALS 3841 PREFIX "CURL" TAG "" ,"OK" EQUALS %X0F018009 PREFIX "CURL" TAG "" diff --git a/perl/README b/perl/README index 6d5e34392..26d627a2b 100644 --- a/perl/README +++ b/perl/README @@ -1,7 +1,7 @@ - _ _ ____ _ - ___| | | | _ \| | - / __| | | | |_) | | - | (__| |_| | _ <| |___ + _ _ ____ _ + ___| | | | _ \| | + / __| | | | |_) | | + | (__| |_| | _ <| |___ \___|\___/|_| \_\_____| Perl diff --git a/perl/contrib/checklinks.pl.in b/perl/contrib/checklinks.pl.in index 6be659faa..1b453742f 100644 --- a/perl/contrib/checklinks.pl.in +++ b/perl/contrib/checklinks.pl.in @@ -103,7 +103,7 @@ sub SplitURL { $getpath =""; $getdocument = $3; } - + } elsif ($inurl=~ /^([^:]+):\/\/(.*)/ ) { $getprotocol = $1; @@ -199,7 +199,7 @@ sub LinkWorks { return "GOOD"; } else { - + if($head && ($error >= 500)) { # This server doesn't like HEAD! @doc = `$linkcheckfull \"$check\"`; @@ -223,7 +223,7 @@ sub GetLinks { $tag = $1; if($tag =~ /^<!--/) { - # this is a comment tag, ignore it + # this is a comment tag, ignore it } else { if($tag =~ /(src|href|background|archive) *= *(\"[^\"]\"|[^ )>]*)/i) { @@ -239,7 +239,7 @@ sub GetLinks { if($url eq "") { # if the link was nothing than a #-link it may now have # been emptied completely so then we skip the rest - next getlinkloop; + next getlinkloop; } if($done{$url}) { diff --git a/perl/contrib/crawlink.pl b/perl/contrib/crawlink.pl index 53be500cc..ba10b8b7c 100755 --- a/perl/contrib/crawlink.pl +++ b/perl/contrib/crawlink.pl @@ -140,7 +140,7 @@ sub SplitURL { $getpath =""; $getdocument = $3; } - + } elsif ($inurl=~ /^([^:]+):\/\/(.*)/ ) { $getprotocol = $1; @@ -235,7 +235,7 @@ sub LinkWorks { return "GOOD"; } else { - + if($head && ($error >= 500)) { # This server doesn't like HEAD! @doc = `$linkcheckfull \"$check\"`; @@ -258,7 +258,7 @@ sub GetLinks { my $tag = $1; if($tag =~ /^<!--/) { - # this is a comment tag, ignore it + # this is a comment tag, ignore it } else { if($tag =~ /(src|href|background|archive) *= *(\"[^\"]\"|[^ \)>]*)/i) { @@ -274,7 +274,7 @@ sub GetLinks { if($url eq "") { # if the link was nothing than a #-link it may now have # been emptied completely so then we skip the rest - next; + next; } if($done{$url}) { @@ -355,7 +355,7 @@ while(1) { #print "path = $getpath\n"; #print "document = $getdocument\n"; #exit; - + # # Extracts all links from the given HTML buffer # @@ -377,7 +377,7 @@ while(1) { if($external) { next; } - + # this is a link on the same server: if($url =~ /^\//) { # from root @@ -386,7 +386,7 @@ while(1) { else { # from the scanned page's dir my $nyurl=$url; - + if(length($getpath) && ($getpath !~ /\/$/) && ($nyurl !~ /^\//)) { @@ -402,7 +402,7 @@ while(1) { my $count = $done{$url}; $allcount += $count; - + print "$success $count <".$tagtype{$url}."> $link $url\n"; if("BAD" eq $success) { @@ -430,7 +430,7 @@ while(1) { $rooturls{$link}++; # check this if not checked already } } - + } } diff --git a/perl/contrib/formfind b/perl/contrib/formfind index 976e3ee54..6d291ddd6 100755 --- a/perl/contrib/formfind +++ b/perl/contrib/formfind @@ -76,7 +76,7 @@ while($in =~ /[^<]*(<[^>]+>)/g ) { $tag = $1; if($tag =~ /^<!--/) { - # this is a comment tag, ignore it + # this is a comment tag, ignore it } else { if(!$form && @@ -90,13 +90,13 @@ while($in =~ /[^<]*(<[^>]+>)/g ) { } $action= $tag; $action=~ s/.*action *= *(\'|\"|)([^ \"\'>]*).*/$2/gi; - + $method=uc($method); - + $enctype=$tag; if ($enctype =~ /enctype *=/) { $enctype=~ s/.*enctype *= *(\'|\"|)([^ \"\'>]*).*/$2/gi; - + if($enctype eq "multipart/form-data") { $enctype="multipart form upload [use -F]" } @@ -132,7 +132,7 @@ while($in =~ /[^<]*(<[^>]+>)/g ) { elsif($form && ($tag =~ /^< *(input|select)/i)) { $mtag = $1; - + ($name, $value)=namevalue($tag); if($mtag =~ /select/i) { @@ -154,7 +154,7 @@ while($in =~ /[^<]*(<[^>]+>)/g ) { } elsif($name eq "") { # let's read the value parameter - + print "Button: \"$value\" ($type)\n"; push @alts, "$value"; } @@ -173,7 +173,7 @@ while($in =~ /[^<]*(<[^>]+>)/g ) { elsif($form && ($tag =~ /^< *textarea/i)) { my ($name, $value)=namevalue($tag); - + print "Textarea: NAME=\"$name\"\n"; } elsif($select) { diff --git a/perl/contrib/getlinks.pl.in b/perl/contrib/getlinks.pl.in index 1ef0d3e27..0783e2d63 100644 --- a/perl/contrib/getlinks.pl.in +++ b/perl/contrib/getlinks.pl.in @@ -95,7 +95,7 @@ sub SplitURL { $getpath =""; $getdocument = $3; } - + } elsif ($inurl=~ /^([^:]+):\/\/(.*)/ ) { $getprotocol = $1; @@ -178,7 +178,7 @@ sub GetLinks { $tag = $1; if($tag =~ /^<!--/) { - # this is a comment tag, ignore it + # this is a comment tag, ignore it } else { if($tag =~ /(src|href|background|archive) *= *(\"[^\"]\"|[^ )>]*)/i) { @@ -194,7 +194,7 @@ sub GetLinks { if($url eq "") { # if the link was nothing than a #-link it may now have # been emptied completely so then we skip the rest - next getlinkloop; + next getlinkloop; } if($done{$url}) { diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9db5fd79a..baa9666dc 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -43,7 +43,7 @@ target_link_libraries( ${EXE_NAME} libcurl ) #SET_TARGET_PROPERTIES(${EXE_NAME} LIBRARY_OUTPUT_DIRECTORY "blah blah blah") # Add the postfix to the executable since it is not added automatically as for modules and shared libraries -set_target_properties(${EXE_NAME} PROPERTIES +set_target_properties(${EXE_NAME} PROPERTIES DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}") if(MSVC) diff --git a/src/Makefile.inc b/src/Makefile.inc index 8ea5dae4d..9faf89d3d 100644 --- a/src/Makefile.inc +++ b/src/Makefile.inc @@ -1,5 +1,5 @@ # ./src/Makefile.inc - + # libcurl has sources that provide functions named curlx_* that aren't part of # the official API, but we re-use the code here to avoid duplication. CURLX_ONES = $(top_srcdir)/lib/strtoofft.c \ diff --git a/src/Makefile.riscos b/src/Makefile.riscos index d0e13d212..35a194ff4 100644 --- a/src/Makefile.riscos +++ b/src/Makefile.riscos @@ -9,7 +9,7 @@ objs = o.hugehelp o.main o.urlglob o.writeout o.writeenv o.rawstr o.nonblock # Compile options: linkopts = ../lib/libcurl openldap:libraries/libldap/libldap -o curl -compileropts = -mpoke-function-name -IUtilLib: -mthrowback +compileropts = -mpoke-function-name -IUtilLib: -mthrowback # Project target: curl: $(objs) diff --git a/src/getpass.c b/src/getpass.c index a46d8e30d..ce3ab5e0f 100644 --- a/src/getpass.c +++ b/src/getpass.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -124,7 +124,7 @@ char *getpass_r(const char *prompt, char *buffer, size_t buflen) previous one as well */ i = i - (i>=1?2:1); } -#ifndef __SYMBIAN32__ +#ifndef __SYMBIAN32__ /* since echo is disabled, print a newline */ fputs("\n", stderr); #endif @@ -157,7 +157,7 @@ char *getpass_r(const char *prompt, char *buffer, size_t buflen) if (buffer[i-1] == '\b') { /* remove this letter and if this is not the first key, remove the previous one as well */ - if (i > 1) { + if (i > 1) { printf("\b \b"); i = i - 2; } else { diff --git a/src/homedir.h b/src/homedir.h index 4daa84e10..84420eeae 100644 --- a/src/homedir.h +++ b/src/homedir.h @@ -1,18 +1,18 @@ -#ifndef __HOMEDIR_H -#define __HOMEDIR_H +#ifndef HEADER_CURL_HOMEDIR_H +#define HEADER_CURL_HOMEDIR_H /*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms * are also available at http://curl.haxx.se/docs/copyright.html. - * + * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is * furnished to do so, under the terms of the COPYING file. @@ -25,4 +25,4 @@ char *homedir(void); -#endif +#endif /* HEADER_CURL_HOMEDIR_H */ diff --git a/src/hugehelp.h b/src/hugehelp.h index 81994b784..a6c66ded6 100644 --- a/src/hugehelp.h +++ b/src/hugehelp.h @@ -1,18 +1,18 @@ -#ifndef __HUGEHELP_H -#define __HUGEHELP_H +#ifndef HEADER_CURL_HUGEHELP_H +#define HEADER_CURL_HUGEHELP_H /*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms * are also available at http://curl.haxx.se/docs/copyright.html. - * + * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is * furnished to do so, under the terms of the COPYING file. @@ -23,4 +23,5 @@ * $Id$ ***************************************************************************/ void hugehelp(void); -#endif + +#endif /* HEADER_CURL_HUGEHELP_H */ diff --git a/src/mkhelp.pl b/src/mkhelp.pl index 7fb37db58..c84ab4ae7 100644 --- a/src/mkhelp.pl +++ b/src/mkhelp.pl @@ -87,7 +87,7 @@ if($c) { close(GZIP); system("gzip --best --no-name dumpit"); - + open(GZIP, "<dumpit.gz") || die "can't read the dumpit.gz file, try without -c"; binmode GZIP; diff --git a/src/setup.h b/src/setup.h index 36fde516f..16112f50d 100644 --- a/src/setup.h +++ b/src/setup.h @@ -1,5 +1,5 @@ -#ifndef __SRC_CURL_SETUP_H -#define __SRC_CURL_SETUP_H +#ifndef HEADER_CURL_SRC_SETUP_H +#define HEADER_CURL_SRC_SETUP_H /*************************************************************************** * _ _ ____ _ * Project ___| | | | _ \| | @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -91,10 +91,10 @@ # endif #endif -/* +/* * Include header files for windows builds before redefining anything. - * Use this preproessor block only to include or exclude windows.h, - * winsock2.h, ws2tcpip.h or winsock.h. Any other windows thing belongs + * Use this preproessor block only to include or exclude windows.h, + * winsock2.h, ws2tcpip.h or winsock.h. Any other windows thing belongs * to any other further and independent block. Under Cygwin things work * just as under linux (e.g. <sys/socket.h>) and the winsock headers should * never be included when __CYGWIN__ is defined. configure script takes @@ -216,4 +216,4 @@ int fileno( FILE *stream); #include "setup_once.h" #endif -#endif /* __SRC_CURL_SETUP_H */ +#endif /* HEADER_CURL_SRC_SETUP_H */ diff --git a/src/version.h b/src/version.h index 316dc80b9..75866fac4 100644 --- a/src/version.h +++ b/src/version.h @@ -1,18 +1,18 @@ -#ifndef __VERSION_H -#define __VERSION_H +#ifndef HEADER_CURL_VERSION_H +#define HEADER_CURL_VERSION_H /*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms * are also available at http://curl.haxx.se/docs/copyright.html. - * + * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is * furnished to do so, under the terms of the COPYING file. @@ -33,4 +33,4 @@ #define CURL_VERSION_PATCH LIBCURL_VERSION_PATCH #define CURL_ID CURL_NAME " " CURL_VERSION " (" OS ") " -#endif +#endif /* HEADER_CURL_VERSION_H */ diff --git a/src/writeenv.h b/src/writeenv.h index 0ad94c45b..8343deff0 100644 --- a/src/writeenv.h +++ b/src/writeenv.h @@ -1,18 +1,18 @@ -#ifndef __WRITEENV_H -#define __WRITEENV_H +#ifndef HEADER_CURL_WRITEENV_H +#define HEADER_CURL_WRITEENV_H /*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms * are also available at http://curl.haxx.se/docs/copyright.html. - * + * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is * furnished to do so, under the terms of the COPYING file. @@ -25,4 +25,4 @@ void ourWriteEnv(CURL *curl); -#endif +#endif /* HEADER_CURL_WRITEENV_H */ diff --git a/src/writeout.h b/src/writeout.h index 222e27029..c5b7ee6ee 100644 --- a/src/writeout.h +++ b/src/writeout.h @@ -1,18 +1,18 @@ -#ifndef __WRITEOUT_H -#define __WRITEOUT_H +#ifndef HEADER_CURL_WRITEOUT_H +#define HEADER_CURL_WRITEOUT_H /*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2004, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms * are also available at http://curl.haxx.se/docs/copyright.html. - * + * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is * furnished to do so, under the terms of the COPYING file. @@ -25,4 +25,4 @@ void ourWriteOut(CURL *curl, const char *out); -#endif +#endif /* HEADER_CURL_WRITEOUT_H */ diff --git a/tests/README b/tests/README index 8af798d93..be22778cd 100644 --- a/tests/README +++ b/tests/README @@ -1,7 +1,7 @@ - _ _ ____ _ - ___| | | | _ \| | - / __| | | | |_) | | - | (__| |_| | _ <| |___ + _ _ ____ _ + ___| | | | _ \| | + / __| | | | |_) | | + | (__| |_| | _ <| |___ \___|\___/|_| \_\_____| The cURL Test Suite @@ -156,5 +156,5 @@ TEST CASE NUMBERS TODO: * Add tests for TELNET, LDAP, DICT... - * SOCKS4/5 test deficiencies - no proxy authentication tests as SSH (the + * SOCKS4/5 test deficiencies - no proxy authentication tests as SSH (the test mechanism) doesn't support them diff --git a/tests/certs/scripts/genroot.sh b/tests/certs/scripts/genroot.sh index 85425a8c5..b463e2c6e 100755 --- a/tests/certs/scripts/genroot.sh +++ b/tests/certs/scripts/genroot.sh @@ -3,7 +3,7 @@ # (c) CopyRight EdelWeb for EdelKey and OpenEvidence, 2000-2004, 2009 # Author: Peter Sylvester -# "libre" for integration with curl +# "libre" for integration with curl OPENSSL=openssl if [ -f /usr/local/ssl/bin/openssl ] ; then @@ -38,20 +38,20 @@ fi GETSERIAL="\$t = time ;\$d = \$t . substr(\$t+$$ ,-4,4)-1;print \$d" SERIAL=`/usr/bin/env perl -e "$GETSERIAL"` -echo SERIAL=$SERIAL PREFIX=$PREFIX DURATION=$DURATION KEYSIZE=$KEYSIZE +echo SERIAL=$SERIAL PREFIX=$PREFIX DURATION=$DURATION KEYSIZE=$KEYSIZE echo "openssl req -config $PREFIX-ca.prm -newkey rsa:$KEYSIZE -keyout $PREFIX-ca.key -out $PREFIX-ca.csr" $OPENSSL req -config $PREFIX-ca.prm -newkey rsa:$KEYSIZE -keyout $PREFIX-ca.key -out $PREFIX-ca.csr echo "openssl x509 -set_serial $SERIAL -extfile $PREFIX-ca.prm -days $DURATION -req -signkey $PREFIX-ca.key -in $PREFIX-ca.csr -out $PREFIX-$SERIAL.ca-cacert -sha1 " -$OPENSSL x509 -set_serial $SERIAL -extfile $PREFIX-ca.prm -days $DURATION -req -signkey $PREFIX-ca.key -in $PREFIX-ca.csr -out $PREFIX-$SERIAL-ca.cacert -sha1 +$OPENSSL x509 -set_serial $SERIAL -extfile $PREFIX-ca.prm -days $DURATION -req -signkey $PREFIX-ca.key -in $PREFIX-ca.csr -out $PREFIX-$SERIAL-ca.cacert -sha1 echo "openssl x509 -text -hash -out $PREFIX-ca.cacert -in $PREFIX-$SERIAL-ca.cacert -nameopt multiline" $OPENSSL x509 -text -hash -out $PREFIX-ca.cacert -in $PREFIX-$SERIAL-ca.cacert -nameopt multiline echo "openssl x509 -in $PREFIX-ca.cacert -outform der -out $PREFIX-ca.der " -$OPENSSL x509 -in $PREFIX-ca.cacert -outform der -out $PREFIX-ca.der +$OPENSSL x509 -in $PREFIX-ca.cacert -outform der -out $PREFIX-ca.der echo "openssl x509 -in $PREFIX-ca.cacert -text -out $PREFIX-ca.crt -nameopt multiline" diff --git a/tests/certs/scripts/genserv.sh b/tests/certs/scripts/genserv.sh index 13caf1a6a..61145d84b 100755 --- a/tests/certs/scripts/genserv.sh +++ b/tests/certs/scripts/genserv.sh @@ -3,7 +3,7 @@ # (c) CopyRight EdelWeb for EdelKey and OpenEvidence, 2000-2004, 2009 # Author: Peter Sylvester -# "libre" for integration with curl +# "libre" for integration with curl OPENSSL=openssl if [ -f /usr/local/ssl/bin/openssl ] ; then @@ -59,7 +59,7 @@ if [ ".$SERIAL" = . ] ; then SERIAL=`/usr/bin/env perl -e "$GETSERIAL"` fi -echo SERIAL=$SERIAL PREFIX=$PREFIX CAPREFIX=$CAPREFIX DURATION=$DURATION KEYSIZE=$KEYSIZE +echo SERIAL=$SERIAL PREFIX=$PREFIX CAPREFIX=$CAPREFIX DURATION=$DURATION KEYSIZE=$KEYSIZE if [ "$DHP." = YES. ] ; then echo "openssl dhparam -2 -out $PREFIX-sv.dhp $KEYSIZE" @@ -72,7 +72,7 @@ if [ "$REQ." = YES. ] ; then fi echo "openssl rsa -in $PREFIX-sv.key -out $PREFIX-sv.key" -$OPENSSL rsa -in $PREFIX-sv.key -out $PREFIX-sv.key -passin pass:secret +$OPENSSL rsa -in $PREFIX-sv.key -out $PREFIX-sv.key -passin pass:secret echo pseudo secrets generated read @@ -84,7 +84,7 @@ if [ "$P12." = YES. ] ; then echo "$OPENSSL pkcs12 -export -des3 -out $PREFIX-sv.p12 -caname $CAPREFIX -name $PREFIX -inkey $PREFIX-sv.key -in $PREFIX-sv.crt -certfile $CAPREFIX-ca.crt " - $OPENSSL pkcs12 -export -des3 -out $PREFIX-sv.p12 -caname $CAPREFIX -name $PREFIX -inkey $PREFIX-sv.key -in $PREFIX-sv.crt -certfile $CAPREFIX-ca.crt + $OPENSSL pkcs12 -export -des3 -out $PREFIX-sv.p12 -caname $CAPREFIX -name $PREFIX -inkey $PREFIX-sv.key -in $PREFIX-sv.crt -certfile $CAPREFIX-ca.crt read fi @@ -93,14 +93,14 @@ echo "openssl x509 -noout -text -hash -in $PREFIX-sv.selfcert -nameopt multiline $OPENSSL x509 -noout -text -hash -in $PREFIX-sv.crt -nameopt multiline echo "openssl x509 -in $PREFIX-sv.crt -outform der -out $PREFIX-sv.der " -$OPENSSL x509 -in $PREFIX-sv.crt -outform der -out $PREFIX-sv.der +$OPENSSL x509 -in $PREFIX-sv.crt -outform der -out $PREFIX-sv.der read # all together now touch $PREFIX-sv.dhp cat $PREFIX-sv.prm $PREFIX-sv.key $PREFIX-sv.crt $PREFIX-sv.dhp >$PREFIX-sv.pem -chmod o-r $PREFIX-sv.prm +chmod o-r $PREFIX-sv.prm echo "$PREFIX-sv.pem done" - + diff --git a/tests/ftpserver.pl b/tests/ftpserver.pl index 51c38cf10..bc868cfd2 100644 --- a/tests/ftpserver.pl +++ b/tests/ftpserver.pl @@ -346,7 +346,7 @@ sub protocolsetup { 'NLST' => \&NLST_ftp, 'PASV' => \&PASV_ftp, 'EPSV' => \&PASV_ftp, - 'RETR' => \&RETR_ftp, + 'RETR' => \&RETR_ftp, 'SIZE' => \&SIZE_ftp, 'REST' => \&REST_ftp, 'STOR' => \&STOR_ftp, @@ -466,7 +466,7 @@ sub close_dataconn { } ################ -################ SMTP commands +################ SMTP commands ################ # what set by "RCPT" @@ -516,7 +516,7 @@ sub DATA_smtp { } sysread \*SFREAD, $line, $size; - + $ulsize += $size; print FILE $line if(!$nosave); @@ -556,7 +556,7 @@ sub RCPT_smtp { } ################ -################ IMAP commands +################ IMAP commands ################ # global to allow the command functions to read it @@ -624,12 +624,12 @@ sub FETCH_imap { } sendcontrol "$cmdid OK FETCH completed\r\n"; - + return 0; } ################ -################ POP3 commands +################ POP3 commands ################ sub RETR_pop3 { @@ -670,12 +670,12 @@ sub RETR_pop3 { # end with the magic 5-byte end of mail marker sendcontrol "\r\n.\r\n"; - + return 0; } ################ -################ FTP commands +################ FTP commands ################ my $rest=0; sub REST_ftp { @@ -837,7 +837,7 @@ sub RETR_ftp { my %hash = getpartattr("reply", "data$testpart"); if($size || $hash{'sendzero'}) { - + if($rest) { # move read pointer forward $size -= $rest; @@ -903,7 +903,7 @@ sub STOR_ftp { } sysread DREAD, $line, $size; - + #print STDERR " GOT: $size bytes\n"; $ulsize += $size; @@ -960,7 +960,7 @@ sub PASV_ftp { # Find out what port we listen on my $i; print DWRITE "PORT\n"; - + # READ the response code sysread_or_die(\*DREAD, \$i, 5); @@ -971,10 +971,10 @@ sub PASV_ftp { if($i =~ /^([0-9a-fA-F]{4})\n/) { $size = hex($1); } - + # READ the response data sysread_or_die(\*DREAD, \$i, $size); - + # The data is in the format # IPvX/NNN @@ -1302,7 +1302,7 @@ logmsg("logged pid $$ in $pidfile\n"); while(1) { # # We read 'sockfilt' commands. - # + # my $input; logmsg "Awaiting input\n"; @@ -1322,7 +1322,7 @@ while(1) { $| = 1; killsockfilters($proto, $ipvnum, $idnum, $verbose, 'data'); - + &customize(); # read test control instructions sendcontrol @welcome; @@ -1360,9 +1360,9 @@ while(1) { # data sysread SFREAD, $_, $size; - + ftpmsg $_; - + # Remove trailing CRLF. s/[\n\r]+$//; @@ -1388,7 +1388,7 @@ while(1) { $FTPCMD=$1; $FTPARG=$2; } - + logmsg "< \"$full\"\n"; if($verbose) { @@ -1444,7 +1444,7 @@ while(1) { logmsg "$FTPCMD wasn't handled!\n"; sendcontrol "500 $FTPCMD is not dealt with!\r\n"; } - + } # while(1) logmsg "====> Client disconnected\n"; diff --git a/tests/getpart.pm b/tests/getpart.pm index 9ade56a19..7f426179b 100644 --- a/tests/getpart.pm +++ b/tests/getpart.pm @@ -199,7 +199,7 @@ sub showdiff { my $file1="$logdir/check-generated"; my $file2="$logdir/check-expected"; - + open(TEMP, ">$file1"); for(@$firstref) { print TEMP $_; diff --git a/tests/libtest/CMakeLists.txt b/tests/libtest/CMakeLists.txt index f0ee8cd2b..653e5315d 100644 --- a/tests/libtest/CMakeLists.txt +++ b/tests/libtest/CMakeLists.txt @@ -20,9 +20,9 @@ function(SETUP_TEST TEST_NAME) # ARGN are the files in the test set_target_properties(${TEST_NAME} PROPERTIES PROJECT_LABEL "${TARGET_LABEL_PREFIX}${TEST_NAME}") - # Add the postfix to the executable since it is + # Add the postfix to the executable since it is # not added automatically as for modules and shared libraries - set_target_properties(${TEST_NAME} + set_target_properties(${TEST_NAME} PROPERTIES DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}") if(MSVC) diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am index 81a0606be..9c041d7f2 100644 --- a/tests/libtest/Makefile.am +++ b/tests/libtest/Makefile.am @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -48,7 +48,7 @@ INCLUDES = -I$(top_builddir)/include/curl \ -I$(top_builddir)/include \ -I$(top_srcdir)/include \ -I$(top_builddir)/lib \ - -I$(top_srcdir)/lib + -I$(top_srcdir)/lib endif EXTRA_DIST = test75.pl test307.pl test610.pl test613.pl test1013.pl \ diff --git a/tests/libtest/lib502.c b/tests/libtest/lib502.c index 0a0a819b0..d1c734cc7 100644 --- a/tests/libtest/lib502.c +++ b/tests/libtest/lib502.c @@ -63,7 +63,7 @@ int test(char *URL) while (running) { res = (int)curl_multi_perform(m, &running); - if (tutil_tvdiff(tutil_tvnow(), mp_start) > + if (tutil_tvdiff(tutil_tvnow(), mp_start) > MULTI_PERFORM_HANG_TIMEOUT) { mp_timedout = TRUE; break; diff --git a/tests/libtest/lib507.c b/tests/libtest/lib507.c index 252775840..306ba2da3 100644 --- a/tests/libtest/lib507.c +++ b/tests/libtest/lib507.c @@ -64,7 +64,7 @@ int test(char *URL) do { ret = curl_multi_perform(multi, &still_running); - if (tutil_tvdiff(tutil_tvnow(), mp_start) > + if (tutil_tvdiff(tutil_tvnow(), mp_start) > MULTI_PERFORM_HANG_TIMEOUT) { mp_timedout = TRUE; break; @@ -88,7 +88,7 @@ int test(char *URL) timeout.tv_sec = 1; timeout.tv_usec = 0; - if (tutil_tvdiff(tutil_tvnow(), ml_start) > + if (tutil_tvdiff(tutil_tvnow(), ml_start) > MAIN_LOOP_HANG_TIMEOUT) { ml_timedout = TRUE; break; @@ -105,7 +105,7 @@ int test(char *URL) mp_start = tutil_tvnow(); do { ret = curl_multi_perform(multi, &still_running); - if (tutil_tvdiff(tutil_tvnow(), mp_start) > + if (tutil_tvdiff(tutil_tvnow(), mp_start) > MULTI_PERFORM_HANG_TIMEOUT) { mp_timedout = TRUE; break; diff --git a/tests/libtest/lib518.c b/tests/libtest/lib518.c index d8310d92d..9d1ae96ac 100644 --- a/tests/libtest/lib518.c +++ b/tests/libtest/lib518.c @@ -216,7 +216,7 @@ static int rlimit(int keep_open) /* * verify that soft limit is higher than NUM_NEEDED, - * which is the number of file descriptors we would + * which is the number of file descriptors we would * try to open plus SAFETY_MARGIN to not exhaust the * file descriptor pool */ @@ -329,8 +329,8 @@ static int rlimit(int keep_open) /* create a bunch of file descriptors */ - for (num_open.rlim_cur = 1; - num_open.rlim_cur < num_open.rlim_max; + for (num_open.rlim_cur = 1; + num_open.rlim_cur < num_open.rlim_max; num_open.rlim_cur++) { fd[num_open.rlim_cur] = dup(fd[0]); @@ -468,7 +468,7 @@ int test(char *URL) return TEST_ERR_MAJOR_BAD; } - /* run the test with the bunch of open file descriptors + /* run the test with the bunch of open file descriptors and close them all once the test is over */ if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) { diff --git a/tests/libtest/lib526.c b/tests/libtest/lib526.c index 89fddbc51..65fa2fd3a 100644 --- a/tests/libtest/lib526.c +++ b/tests/libtest/lib526.c @@ -129,7 +129,7 @@ int test(char *URL) interval.tv_sec = 1; interval.tv_usec = 0; - if (tutil_tvdiff(tutil_tvnow(), ml_start) > + if (tutil_tvdiff(tutil_tvnow(), ml_start) > MAIN_LOOP_HANG_TIMEOUT) { ml_timedout = TRUE; break; @@ -139,7 +139,7 @@ int test(char *URL) while (res == CURLM_CALL_MULTI_PERFORM) { res = (int)curl_multi_perform(m, &running); - if (tutil_tvdiff(tutil_tvnow(), mp_start) > + if (tutil_tvdiff(tutil_tvnow(), mp_start) > MULTI_PERFORM_HANG_TIMEOUT) { mp_timedout = TRUE; break; diff --git a/tests/libtest/lib530.c b/tests/libtest/lib530.c index 3b0bd001c..01f35f765 100644 --- a/tests/libtest/lib530.c +++ b/tests/libtest/lib530.c @@ -141,7 +141,7 @@ int test(char *URL) interval.tv_sec = 1; interval.tv_usec = 0; - if (tutil_tvdiff(tutil_tvnow(), ml_start) > + if (tutil_tvdiff(tutil_tvnow(), ml_start) > MAIN_LOOP_HANG_TIMEOUT) { ml_timedout = TRUE; break; @@ -151,7 +151,7 @@ int test(char *URL) while (res == CURLM_CALL_MULTI_PERFORM) { res = (int)curl_multi_perform(m, &running); - if (tutil_tvdiff(tutil_tvnow(), mp_start) > + if (tutil_tvdiff(tutil_tvnow(), mp_start) > MULTI_PERFORM_HANG_TIMEOUT) { mp_timedout = TRUE; break; diff --git a/tests/libtest/lib533.c b/tests/libtest/lib533.c index 810b075e5..42dfb1a41 100644 --- a/tests/libtest/lib533.c +++ b/tests/libtest/lib533.c @@ -79,7 +79,7 @@ int test(char *URL) interval.tv_sec = 1; interval.tv_usec = 0; - if (tutil_tvdiff(tutil_tvnow(), ml_start) > + if (tutil_tvdiff(tutil_tvnow(), ml_start) > MAIN_LOOP_HANG_TIMEOUT) { ml_timedout = TRUE; break; @@ -89,7 +89,7 @@ int test(char *URL) while (res == CURLM_CALL_MULTI_PERFORM) { res = (int)curl_multi_perform(m, &running); - if (tutil_tvdiff(tutil_tvnow(), mp_start) > + if (tutil_tvdiff(tutil_tvnow(), mp_start) > MULTI_PERFORM_HANG_TIMEOUT) { mp_timedout = TRUE; break; diff --git a/tests/libtest/lib536.c b/tests/libtest/lib536.c index 06d863ca9..2300ce109 100644 --- a/tests/libtest/lib536.c +++ b/tests/libtest/lib536.c @@ -33,7 +33,7 @@ static CURLMcode perform(CURLM * multi) for (;;) { code = curl_multi_perform(multi, &handles); - if (tutil_tvdiff(tutil_tvnow(), mp_start) > + if (tutil_tvdiff(tutil_tvnow(), mp_start) > MULTI_PERFORM_HANG_TIMEOUT) { mp_timedout = TRUE; break; diff --git a/tests/libtest/lib537.c b/tests/libtest/lib537.c index 791448a86..b15cb8ac1 100644 --- a/tests/libtest/lib537.c +++ b/tests/libtest/lib537.c @@ -204,7 +204,7 @@ static int rlimit(int keep_open) /* * test 537 is all about testing libcurl functionality * when the system has nearly exhausted the number of - * available file descriptors. Test 537 will try to run + * available file descriptors. Test 537 will try to run * with a very small number of file descriptors available. * This implies that any file descriptor which is open * when the test runs will have a number in the high range @@ -323,8 +323,8 @@ static int rlimit(int keep_open) /* create a bunch of file descriptors */ - for (num_open.rlim_cur = 1; - num_open.rlim_cur < num_open.rlim_max; + for (num_open.rlim_cur = 1; + num_open.rlim_cur < num_open.rlim_max; num_open.rlim_cur++) { fd[num_open.rlim_cur] = dup(fd[0]); @@ -471,7 +471,7 @@ int test(char *URL) return TEST_ERR_MAJOR_BAD; } - /* run the test with the bunch of open file descriptors + /* run the test with the bunch of open file descriptors and close them all once the test is over */ if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) { diff --git a/tests/libtest/lib556.c b/tests/libtest/lib556.c index 26ae30ccd..583723d22 100644 --- a/tests/libtest/lib556.c +++ b/tests/libtest/lib556.c @@ -46,7 +46,7 @@ int test(char *URL) if(!res) { /* we are connected, now get a HTTP document the raw way */ - const char *request = + const char *request = #ifdef CURL_DOES_CONVERSIONS /* ASCII representation with escape sequences for non-ASCII platforms */ "\x47\x45\x54\x20\x2f\x35\x35\x36\x20\x48\x54\x54\x50\x2f\x31\x2e" diff --git a/tests/libtest/lib558.c b/tests/libtest/lib558.c index 253e043e1..7ed991dd3 100644 --- a/tests/libtest/lib558.c +++ b/tests/libtest/lib558.c @@ -88,7 +88,7 @@ int test(char *URL) CURL *easyh = NULL; struct curl_hash *hp = NULL; int result = 0; - + if(!strcmp(URL, "check")) { /* test harness script verifying if this test can run */ return 0; /* sure, run this! */ diff --git a/tests/libtest/test1013.pl b/tests/libtest/test1013.pl index 8ab1a8c95..33127da4a 100755 --- a/tests/libtest/test1013.pl +++ b/tests/libtest/test1013.pl @@ -1,7 +1,7 @@ #!/usr/bin/env perl # Determine if curl-config --protocols/--features matches the # curl --version protocols/features -if ( $#ARGV != 2 ) +if ( $#ARGV != 2 ) { print "Usage: $0 curl-config-script curl-version-output-file features|protocols\n"; exit 3; diff --git a/tests/libtest/test1022.pl b/tests/libtest/test1022.pl index 5b16de3e0..94b3cb04f 100755 --- a/tests/libtest/test1022.pl +++ b/tests/libtest/test1022.pl @@ -1,6 +1,6 @@ #!/usr/bin/env perl # Determine if curl-config --version matches the curl --version -if ( $#ARGV != 2 ) +if ( $#ARGV != 2 ) { print "Usage: $0 curl-config-script curl-version-output-file version|vernum\n"; exit 3; diff --git a/tests/libtest/test307.pl b/tests/libtest/test307.pl index 7e2687b54..b8e3214fc 100755 --- a/tests/libtest/test307.pl +++ b/tests/libtest/test307.pl @@ -1,6 +1,6 @@ #!/usr/bin/env perl # Determine if the given curl executable supports the 'openssl' SSL engine -if ( $#ARGV != 0 ) +if ( $#ARGV != 0 ) { print "Usage: $0 curl-executable\n"; exit 3; diff --git a/tests/libtest/test610.pl b/tests/libtest/test610.pl index 5257171a7..c9542ca51 100755 --- a/tests/libtest/test610.pl +++ b/tests/libtest/test610.pl @@ -1,6 +1,6 @@ #!/usr/bin/env perl # Perform simple file and directory manipulation in a portable way -if ( $#ARGV <= 0 ) +if ( $#ARGV <= 0 ) { print "Usage: $0 mkdir|rmdir|rm|move|gone path1 [path2] [more commands...]\n"; exit 1; diff --git a/tests/libtest/test613.pl b/tests/libtest/test613.pl index ba9ed32e9..dc3b1fb2e 100755 --- a/tests/libtest/test613.pl +++ b/tests/libtest/test613.pl @@ -2,7 +2,7 @@ # Prepare a directory with known files and clean up afterwards use Time::Local; -if ( $#ARGV < 1 ) +if ( $#ARGV < 1 ) { print "Usage: $0 prepare|postprocess dir [logfile]\n"; exit 1; diff --git a/tests/libtest/test75.pl b/tests/libtest/test75.pl index 01a53ff15..4d14b1e12 100755 --- a/tests/libtest/test75.pl +++ b/tests/libtest/test75.pl @@ -1,6 +1,6 @@ #!/usr/bin/env perl # Check that the length of a given URL is correct -if ( $#ARGV != 1 ) +if ( $#ARGV != 1 ) { print "Usage: $0 string length\n"; exit 3; diff --git a/tests/memanalyze.pl b/tests/memanalyze.pl index 763f9a3b9..232d2dde5 100755 --- a/tests/memanalyze.pl +++ b/tests/memanalyze.pl @@ -176,7 +176,7 @@ while(<FILE>) { newtotal($totalmem); $reallocs++; - + $getmem{$oldaddr}=""; $getmem{$newaddr}="$source:$linenum"; } @@ -192,7 +192,7 @@ while(<FILE>) { $totalmem += $size; if($trace) { - printf("STRDUP: $size bytes at %s, makes totally: %d bytes\n", + printf("STRDUP: $size bytes at %s, makes totally: %d bytes\n", $getmem{$addr}, $totalmem); } @@ -201,7 +201,7 @@ while(<FILE>) { } else { print "Not recognized input line: $function\n"; - } + } } # FD url.c:1282 socket() = 5 elsif($_ =~ /^FD ([^ ]*):(\d*) (.*)/) { @@ -297,7 +297,7 @@ while(<FILE>) { printf("FREEADDRINFO ($source:$linenum)\n"); } } - + } else { print "Not recognized prefix line: $line\n"; diff --git a/tests/runtests.pl b/tests/runtests.pl index 7d10ef4fc..04ecc4a19 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -23,7 +23,7 @@ ########################################################################### # Experimental hooks are available to run tests remotely on machines that -# are able to run curl but are unable to run the test harness. +# are able to run curl but are unable to run the test harness. # The following sections need to be modified: # # $HOSTIP, $HOST6IP - Set to the address of the host running the test suite @@ -3694,7 +3694,7 @@ EOHELP exit; } shift @ARGV; -} +} if(@testthis && ($testthis[0] ne "")) { $TESTCASES=join(" ", @testthis); diff --git a/tests/server/CMakeLists.txt b/tests/server/CMakeLists.txt index 99ec3d897..0401df215 100644 --- a/tests/server/CMakeLists.txt +++ b/tests/server/CMakeLists.txt @@ -11,8 +11,8 @@ function(SETUP_EXECUTABLE TEST_NAME) # ARGN are the files in the test ) if(CURL_USE_ARES) include_directories(${CARES_INCLUDE_DIR}) - endif() - # resolve test needs this + endif() + # resolve test needs this setup_curl_dependencies(${TEST_NAME}) #TARGET_LINK_LIBRARIES( ${TEST_NAME} libcurl ) @@ -23,13 +23,13 @@ function(SETUP_EXECUTABLE TEST_NAME) # ARGN are the files in the test # files on Win32 targets it is necessary to build the test servers # with CURL_STATICLIB defined, independently of how libcurl is built. if(NOT CURL_STATICLIB) - set_target_properties(${TEST_NAME} PROPERTIES + set_target_properties(${TEST_NAME} PROPERTIES COMPILE_DEFINITIONS CURL_STATICLIB) # ${UPPER_TEST_NAME} endif() - set_target_properties(${TEST_NAME} PROPERTIES + set_target_properties(${TEST_NAME} PROPERTIES PROJECT_LABEL "${TARGET_LABEL_PREFIX}${TEST_NAME}") - # Add the postfix to the executable since it is not added + # Add the postfix to the executable since it is not added # automatically as for modules and shared libraries set_target_properties(${TEST_NAME} PROPERTIES DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}") @@ -45,7 +45,7 @@ function(SETUP_EXECUTABLE TEST_NAME) # ARGN are the files in the test endfunction() -transform_makefile_inc("Makefile.inc" +transform_makefile_inc("Makefile.inc" "${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake") include(${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake) diff --git a/tests/testcurl.1 b/tests/testcurl.1 index 9b98eea21..d106211f9 100644 --- a/tests/testcurl.1 +++ b/tests/testcurl.1 @@ -5,7 +5,7 @@ .\" * | (__| |_| | _ <| |___ .\" * \___|\___/|_| \_\_____| .\" * -.\" * Copyright (C) 1998 - 2005, Daniel Stenberg, <daniel@haxx.se>, et al. +.\" * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. .\" * .\" * This software is licensed as described in the file COPYING, which .\" * you should have received as part of this distribution. The terms @@ -120,7 +120,7 @@ testprog="perl ./curl/tests/testcurl.pl $name $email $desc" opts1="--configure=--enable-debug" opts2="--configure=--enable-ipv6" -# run first test +# run first test $testprog $opts1 | $mail # run second test diff --git a/tests/valgrind.pm b/tests/valgrind.pm index 82efe2f8a..b8c2594ef 100644 --- a/tests/valgrind.pm +++ b/tests/valgrind.pm @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2005, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -92,7 +92,7 @@ sub valgrindparse { # us use OpenSSL. OpenSSL produces numerous valgrind # errors of this kind, rendering it impossible for us to # detect (valid) reports on actual curl or libcurl code. - + if(!$sslenabled) { $uninitedvar = 1; $error++; |