diff options
| -rw-r--r-- | CHANGES.0 | 16 | ||||
| -rwxr-xr-x | CMake/FindCARES.cmake | 2 | ||||
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | docs/INSTALL | 2 | ||||
| -rw-r--r-- | docs/examples/Makefile.m32 | 2 | ||||
| -rwxr-xr-x | docs/examples/version-check.pl | 2 | ||||
| -rw-r--r-- | lib/Makefile.m32 | 2 | ||||
| -rw-r--r-- | lib/libcurl.plist | 22 | ||||
| -rwxr-xr-x | log2changes.pl | 2 | ||||
| -rw-r--r-- | perl/contrib/checklinks.pl.in | 2 | ||||
| -rwxr-xr-x | perl/contrib/crawlink.pl | 4 | ||||
| -rw-r--r-- | perl/contrib/getlinks.pl.in | 4 | ||||
| -rw-r--r-- | src/Makefile.Watcom | 4 | ||||
| -rw-r--r-- | src/Makefile.m32 | 2 | ||||
| -rw-r--r-- | tests/libtest/first.c | 2 | ||||
| -rwxr-xr-x | tests/runtests.pl | 6 | ||||
| -rw-r--r-- | tests/symbol-scan.pl | 3 | ||||
| -rw-r--r-- | tests/unit/README | 4 |
18 files changed, 42 insertions, 43 deletions
@@ -146,7 +146,7 @@ Daniel Stenberg (14 May 2010) compressed Content-Encoding! (http://curl.haxx.se/bug/view.cgi?id=3000056) - + Daniel Stenberg (12 May 2010) - Howard Chu brought support for RTMP. This is powered by the underlying librtmp library. It supports a range of variations and "sub-protocols" @@ -181,14 +181,14 @@ Daniel Stenberg (7 May 2010) That situation is subject for some closer inspection in the future. - Howard Chu split the I/O handling functions into private handlers. - + Howard Chu brought the bulk work of this patch that properly moves out the sending and recving of data to the parts of the code that are properly responsible for the various ways of doing so. - + Daniel Stenberg assisted with polishing a few bits and fixed some minor flaws in the original patch. - + Another upside of this patch is that we now abuse CURLcodes less with the "magic" -1 return codes and instead use CURLE_AGAIN more consistently. @@ -296,7 +296,7 @@ Daniel Stenberg (28 Mar 2010) - Ben Greear: If you pass a URL to pop3 that does not contain a message ID as part of the URL, it would previously ask for 'INBOX' which just causes the pop3 server to return an error. - + Now libcurl treats en empty message ID as a request for LIST (list of pop3 message IDs). User's code could then parse this and download individual messages as desired. @@ -318,7 +318,7 @@ Daniel Stenberg (24 Mar 2010) the last packet received constitutes the end of the response body, libcurl still treats it as a timeout condition and reports a message like: - "Operation timed out after 3000 milliseconds with 876 out of 876 bytes + "Operation timed out after 3000 milliseconds with 876 out of 876 bytes received" It should only a timeout if the timer lapsed and we DIDN'T receive the end @@ -368,7 +368,7 @@ Daniel Stenberg (22 Mar 2010) case of a timeout, the signal handler for SIGALRM never gets removed. I think that in my case it gets executed at some point later on when execution has long left Curl_resolv_timeout() or even the cURL library. - + The code that is jumped to with siglongjmp() simply sets the error message to "name lookup timed out" and then returns with CURLRESOLV_ERROR. I guess that instead of simply returning without cleaning up, the code should have a @@ -17288,7 +17288,7 @@ Version 5.1 (not publicly released) They should be set for protocol-specific proxies. General proxy should be set with - + ALL_PROXY And a comma-separated list of host names that shouldn't go through any diff --git a/CMake/FindCARES.cmake b/CMake/FindCARES.cmake index f08aae6a5..c4ab5f132 100755 --- a/CMake/FindCARES.cmake +++ b/CMake/FindCARES.cmake @@ -11,7 +11,7 @@ FIND_PATH(CARES_INCLUDE_DIR ares.h /usr/local/include /usr/include ) - + SET(CARES_NAMES ${CARES_NAMES} cares) FIND_LIBRARY(CARES_LIBRARY NAMES ${CARES_NAMES} diff --git a/CMakeLists.txt b/CMakeLists.txt index 8ad8b4abe..dabdbcaec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -382,7 +382,7 @@ if(CMAKE_USE_OPENSSL) check_include_file_concat("openssl/rand.h" HAVE_OPENSSL_RAND_H) endif(CMAKE_USE_OPENSSL) -if(NOT HAVE_LDAP_H) +if(NOT HAVE_LDAP_H) message(STATUS "LDAP_H not found CURL_DISABLE_LDAP set ON") set(CURL_DISABLE_LDAP ON CACHE BOOL "" FORCE) endif() @@ -784,7 +784,7 @@ if(HAVE_SOCKLEN_T) check_type_size("socklen_t" CURL_SIZEOF_CURL_SOCKLEN_T) set(CMAKE_EXTRA_INCLUDE_FILES) if(NOT HAVE_CURL_SIZEOF_CURL_SOCKLEN_T) - message(FATAL_ERROR + message(FATAL_ERROR "Check for sizeof socklen_t failed, see CMakeFiles/CMakerror.log") endif() else() diff --git a/docs/INSTALL b/docs/INSTALL index e0134e8a2..436ebd0ab 100644 --- a/docs/INSTALL +++ b/docs/INSTALL @@ -392,7 +392,7 @@ Win32 set BCCDIR=c:\Borland\BCC55 - In order to build a plain vanilla version of curl and libcurl run the + In order to build a plain vanilla version of curl and libcurl run the following command from curl's root directory: make borland diff --git a/docs/examples/Makefile.m32 b/docs/examples/Makefile.m32 index e744c5b30..3c3d121ed 100644 --- a/docs/examples/Makefile.m32 +++ b/docs/examples/Makefile.m32 @@ -58,7 +58,7 @@ endif ifndef LIBIDN_PATH LIBIDN_PATH = ../../../libidn-1.18 endif -# Edit the path below to point to the base of your MS idndlpackage. +# Edit the path below to point to the base of your MS IDN package. # Microsoft Internationalized Domain Names (IDN) Mitigation APIs 1.1 # http://www.microsoft.com/downloads/en/details.aspx?FamilyID=ad6158d7-ddba-416a-9109-07607425a815 ifndef WINIDN_PATH diff --git a/docs/examples/version-check.pl b/docs/examples/version-check.pl index 9b6a2684c..92f0808d6 100755 --- a/docs/examples/version-check.pl +++ b/docs/examples/version-check.pl @@ -90,7 +90,7 @@ my @recent = reverse sort sortversions keys %used; # the most recent symbol my $newsym = $recent[0]; # the most recent version -my $newver = $doc{$newsym}; +my $newver = $doc{$newsym}; print "The scanned source uses these symbols introduced in $newver:\n"; diff --git a/lib/Makefile.m32 b/lib/Makefile.m32 index 140571653..be6652deb 100644 --- a/lib/Makefile.m32 +++ b/lib/Makefile.m32 @@ -41,7 +41,7 @@ endif ifndef LIBIDN_PATH LIBIDN_PATH = ../../libidn-1.18 endif -# Edit the path below to point to the base of your MS idndlpackage. +# Edit the path below to point to the base of your MS IDN package. # Microsoft Internationalized Domain Names (IDN) Mitigation APIs 1.1 # http://www.microsoft.com/downloads/en/details.aspx?FamilyID=ad6158d7-ddba-416a-9109-07607425a815 ifndef WINIDN_PATH diff --git a/lib/libcurl.plist b/lib/libcurl.plist index 910b2adb1..91eab569c 100644 --- a/lib/libcurl.plist +++ b/lib/libcurl.plist @@ -3,17 +3,17 @@ <plist version="0.9"> <dict> <key>CFBundleInfoDictionaryVersion</key> - <string>6.0</string> - + <string>6.0</string> + <key>CFBundleDevelopmentRegion</key> <string>English</string> - + <key>CFBundleExecutable</key> <string>curl</string> - + <key>CFBundleIdentifier</key> <string>com.libcurl.libcurl</string> - + <key>CFBundleVersion</key> <string>7.12.3</string> @@ -21,15 +21,15 @@ <string>libcurl</string> <key>CFBundlePackageType</key> - <string>FMWK</string> - + <string>FMWK</string> + <key>CFBundleSignature</key> - <string>????</string> - + <string>????</string> + <key>CFBundleShortVersionString</key> <string>libcurl 7.12.3</string> - + <key>CFBundleGetInfoString</key> <string>libcurl.plist 7.12.3</string> </dict> -</plist>
\ No newline at end of file +</plist> diff --git a/log2changes.pl b/log2changes.pl index dbdc69764..a92d939b3 100755 --- a/log2changes.pl +++ b/log2changes.pl @@ -34,7 +34,7 @@ while(<STDIN>) { my $ref = $2; if ($ref =~ /refs\/tags\/curl-([0-9_]*)/) { $tag = $1; - $tag =~ tr/_/./; + $tag =~ tr/_/./; } else { $tag = ''; } diff --git a/perl/contrib/checklinks.pl.in b/perl/contrib/checklinks.pl.in index db70bb112..324a91791 100644 --- a/perl/contrib/checklinks.pl.in +++ b/perl/contrib/checklinks.pl.in @@ -221,7 +221,7 @@ sub GetLinks { while($in =~ /[^<]*(<[^>]+>)/g ) { # we have a tag in $1 $tag = $1; - + if($tag =~ /^<!--/) { # this is a comment tag, ignore it } diff --git a/perl/contrib/crawlink.pl b/perl/contrib/crawlink.pl index 8cb239a62..c224be005 100755 --- a/perl/contrib/crawlink.pl +++ b/perl/contrib/crawlink.pl @@ -135,7 +135,7 @@ sub SplitURL { $getserver = $2; $getpath = $3; $getdocument = ""; - + if($getpath !~ /\//) { $getpath =""; $getdocument = $3; @@ -256,7 +256,7 @@ sub GetLinks { while($in =~ /[^<]*(<[^>]+>)/g ) { # we have a tag in $1 my $tag = $1; - + if($tag =~ /^<!--/) { # this is a comment tag, ignore it } diff --git a/perl/contrib/getlinks.pl.in b/perl/contrib/getlinks.pl.in index 9bdc2bc7b..7253f1e7b 100644 --- a/perl/contrib/getlinks.pl.in +++ b/perl/contrib/getlinks.pl.in @@ -90,7 +90,7 @@ sub SplitURL { $getserver = $2; $getpath = $3; $getdocument = ""; - + if($getpath !~ /\//) { $getpath =""; $getdocument = $3; @@ -176,7 +176,7 @@ sub GetLinks { while($in =~ /[^<]*(<[^>]+>)/g ) { # we have a tag in $1 $tag = $1; - + if($tag =~ /^<!--/) { # this is a comment tag, ignore it } diff --git a/src/Makefile.Watcom b/src/Makefile.Watcom index f0477fd46..01be9c2d2 100644 --- a/src/Makefile.Watcom +++ b/src/Makefile.Watcom @@ -184,8 +184,8 @@ $(LINK_ARG): $(__MAKEFILES__) !ifdef %use_rtmp @%append $^@ library $(LIBRTMP_ROOT)$(DS)librtmp$(DS)librtmp.lib, winmm.lib !endif -!ifdef %use_ssh2 - @%append $^@ library $(LIBSSH2_ROOT)$(DS)win32$(DS)libssh2.lib +!ifdef %use_ssh2 + @%append $^@ library $(LIBSSH2_ROOT)$(DS)win32$(DS)libssh2.lib !endif !ifdef %use_ssl @%append $^@ library $(OPENSSL_ROOT)$(DS)out32$(DS)libeay32.lib, $(OPENSSL_ROOT)$(DS)out32$(DS)ssleay32.lib diff --git a/src/Makefile.m32 b/src/Makefile.m32 index 0822e3a8e..e3f451f99 100644 --- a/src/Makefile.m32 +++ b/src/Makefile.m32 @@ -38,7 +38,7 @@ endif ifndef LIBIDN_PATH LIBIDN_PATH = ../../libidn-1.18 endif -# Edit the path below to point to the base of your MS idndlpackage. +# Edit the path below to point to the base of your MS IDN package. # Microsoft Internationalized Domain Names (IDN) Mitigation APIs 1.1 # http://www.microsoft.com/downloads/en/details.aspx?FamilyID=ad6158d7-ddba-416a-9109-07607425a815 ifndef WINIDN_PATH diff --git a/tests/libtest/first.c b/tests/libtest/first.c index 57e6ddd79..253acb21d 100644 --- a/tests/libtest/first.c +++ b/tests/libtest/first.c @@ -38,7 +38,7 @@ int select_wrapper(int nfds, fd_set *rd, fd_set *wr, fd_set *exc, return -1; } #ifdef USE_WINSOCK - /* + /* * Winsock select() requires that at least one of the three fd_set * pointers is not NULL and points to a non-empty fdset. IOW Winsock * select() can not be used to sleep without a single fd_set. diff --git a/tests/runtests.pl b/tests/runtests.pl index 07d23ae5c..386ed6faf 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -230,7 +230,7 @@ my %skipped; # skipped{reason}=counter, reasons for skip my @teststat; # teststat[testnum]=reason, reasons for skip my %disabled_keywords; # key words of tests to skip my %enabled_keywords; # key words of tests to run -my %disabled; # disabled test cases +my %disabled; # disabled test cases my $sshdid; # for socks server, ssh daemon version id my $sshdvernum; # for socks server, ssh daemon version number @@ -2265,7 +2265,7 @@ sub checksystem { $has_polarssl=1; $has_openssl=1; $ssllib="polarssl"; - } + } elsif ($libcurl =~ /axtls/i) { $has_axtls=1; $ssllib="axTLS"; @@ -3680,7 +3680,7 @@ sub startservers { } } elsif($what eq "ftp2") { - if($torture && $run{'ftp2'} && + if($torture && $run{'ftp2'} && !responsive_pingpong_server("ftp", "2", $verbose)) { stopserver('ftp2'); } diff --git a/tests/symbol-scan.pl b/tests/symbol-scan.pl index 279053cb9..91b859bca 100644 --- a/tests/symbol-scan.pl +++ b/tests/symbol-scan.pl @@ -110,7 +110,7 @@ for my $e (sort @syms) { # *_LAST and *_LASTENTRY are just prefix for the placeholders used for the # last entry in many enum series. # - + if($e =~ /(OBSOLETE|^CURL_EXTERN|_LAST\z|_LASTENTRY\z)/) { $ignored++; next; @@ -159,7 +159,6 @@ if($summary) { scalar(@syms)- $ignored; printf "%d symbols are listed in symbols-in-versions\n (out of which %d are listed as removed)\n", scalar(keys %doc), scalar(keys %rem); printf "%d symbols in symbols-in-versions should match the ones in headers\n", scalar(keys %doc) - scalar(keys %rem); - } if($misses) { diff --git a/tests/unit/README b/tests/unit/README index dd368f789..301cd17d5 100644 --- a/tests/unit/README +++ b/tests/unit/README @@ -62,9 +62,9 @@ UNITTEST_START fail_unless( size == 0 , "initial size should be zero" ); fail_if( head == NULL , "head should not be initiated to NULL" ); - + /* you end the test code like this: */ - + UNITTEST_STOP ----------------------- end ------------------------------- |