diff options
| author | Yang Tse <yangsita@gmail.com> | 2010-02-14 19:40:18 +0000 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2010-02-14 19:40:18 +0000 |
| commit | a07bc79117971b96ebf3188c0a34a73ee0a3609b (patch) | |
| tree | 4c5f985bd2bd407871dfc9d4bc8c05cbaa9851e2 /docs | |
| parent | 2268657272e591948467135dcd713bd80e3212b3 (diff) | |
| download | curl-a07bc79117971b96ebf3188c0a34a73ee0a3609b.tar.gz | |
removed trailing whitespace
Diffstat (limited to 'docs')
40 files changed, 145 insertions, 145 deletions
@@ -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 |