Unity-Technologies
/
curl
зеркало из https://github.com/Unity-Technologies/curl.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

build: make use of 93 lib/*.c renamed files 

93 *.c source files renamed to use our standard naming scheme.

This change affects 77 files in libcurl's source tree.
This commit is contained in:
Yang Tse 2013-01-03 03:53:06 +01:00
Родитель 8f0171bdd4
Коммит 13606bbfde
77 изменённых файлов: 694 добавлений и 476 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
CMakeLists.txt
Просмотреть файл

@ -769,13 +769,13 @@ if(CMAKE_COMPILER_IS_GNUCC AND APPLE)
check_c_compiler_flag(-Wno-long-double HAVE_C_FLAG_Wno_long_double) check_c_compiler_flag(-Wno-long-double HAVE_C_FLAG_Wno_long_double)
if(HAVE_C_FLAG_Wno_long_double) if(HAVE_C_FLAG_Wno_long_double)
# The Mac version of GCC warns about use of long double. Disable it. # The Mac version of GCC warns about use of long double. Disable it.
get_source_file_property(MPRINTF_COMPILE_FLAGS mprintf.c COMPILE_FLAGS) get_source_file_property(MPRINTF_COMPILE_FLAGS curl_mprintf.c COMPILE_FLAGS)
if(MPRINTF_COMPILE_FLAGS) if(MPRINTF_COMPILE_FLAGS)
set(MPRINTF_COMPILE_FLAGS "${MPRINTF_COMPILE_FLAGS} -Wno-long-double") set(MPRINTF_COMPILE_FLAGS "${MPRINTF_COMPILE_FLAGS} -Wno-long-double")
else(MPRINTF_COMPILE_FLAGS) else(MPRINTF_COMPILE_FLAGS)
set(MPRINTF_COMPILE_FLAGS "-Wno-long-double") set(MPRINTF_COMPILE_FLAGS "-Wno-long-double")
endif(MPRINTF_COMPILE_FLAGS) endif(MPRINTF_COMPILE_FLAGS)
set_source_files_properties(mprintf.c PROPERTIES set_source_files_properties(curl_mprintf.c PROPERTIES
COMPILE_FLAGS ${MPRINTF_COMPILE_FLAGS}) COMPILE_FLAGS ${MPRINTF_COMPILE_FLAGS})
endif(HAVE_C_FLAG_Wno_long_double) endif(HAVE_C_FLAG_Wno_long_double)
endif(CMAKE_COMPILER_IS_GNUCC AND APPLE) endif(CMAKE_COMPILER_IS_GNUCC AND APPLE)

107
docs/INTERNALS
Просмотреть файл

@ -117,15 +117,15 @@ Library
There are plenty of entry points to the library, namely each publicly defined There are plenty of entry points to the library, namely each publicly defined
function that libcurl offers to applications. All of those functions are function that libcurl offers to applications. All of those functions are
rather small and easy-to-follow. All the ones prefixed with 'curl_easy' are rather small and easy-to-follow. All the ones prefixed with 'curl_easy' are
put in the lib/easy.c file. put in the lib/curl_easy.c file.
curl_global_init_() and curl_global_cleanup() should be called by the curl_global_init_() and curl_global_cleanup() should be called by the
application to initialize and clean up global stuff in the library. As of application to initialize and clean up global stuff in the library. As of
today, it can handle the global SSL initing if SSL is enabled and it can init today, it can handle the global SSL initing if SSL is enabled and it can init
the socket layer on windows machines. libcurl itself has no "global" scope. the socket layer on windows machines. libcurl itself has no "global" scope.
All printf()-style functions use the supplied clones in lib/mprintf.c. This All printf()-style functions use the supplied clones in lib/curl_mprintf.c.
makes sure we stay absolutely platform independent. This makes sure we stay absolutely platform independent.
curl_easy_init() allocates an internal struct and makes some initializations. curl_easy_init() allocates an internal struct and makes some initializations.
The returned handle does not reveal internals. This is the 'SessionHandle' The returned handle does not reveal internals. This is the 'SessionHandle'
@ -140,17 +140,17 @@ Library
curl_easy_perform() does a whole lot of things: curl_easy_perform() does a whole lot of things:
It starts off in the lib/easy.c file by calling Curl_perform() and the main It starts off in the lib/curl_easy.c file by calling Curl_perform() and the
work then continues in lib/url.c. The flow continues with a call to main work then continues in lib/curl_url.c. The flow continues with a call to
Curl_connect() to connect to the remote site. Curl_connect() to connect to the remote site.
o Curl_connect() o Curl_connect()
... analyzes the URL, it separates the different components and connects to ... analyzes the URL, it separates the different components and connects to
the remote host. This may involve using a proxy and/or using SSL. The the remote host. This may involve using a proxy and/or using SSL. The
Curl_resolv() function in lib/hostip.c is used for looking up host names Curl_resolv() function in lib/curl_hostip.c is used for looking up host
(it does then use the proper underlying method, which may vary between names (it does then use the proper underlying method, which may vary
platforms and builds). between platforms and builds).
When Curl_connect is done, we are connected to the remote site. Then it is When Curl_connect is done, we are connected to the remote site. Then it is
time to tell the server to get a document/file. Curl_do() arranges this. time to tell the server to get a document/file. Curl_do() arranges this.
@ -165,15 +165,15 @@ Library
Curl_do() makes sure the proper protocol-specific function is called. The Curl_do() makes sure the proper protocol-specific function is called. The
functions are named after the protocols they handle. Curl_ftp(), functions are named after the protocols they handle. Curl_ftp(),
Curl_http(), Curl_dict(), etc. They all reside in their respective files Curl_http(), Curl_dict(), etc. They all reside in their respective files
(ftp.c, http.c and dict.c). HTTPS is handled by Curl_http() and FTPS by (curl_ftp.c, curl_http.c and curl_dict.c). HTTPS is handled by Curl_http()
Curl_ftp(). and FTPS by Curl_ftp().
The protocol-specific functions of course deal with protocol-specific The protocol-specific functions of course deal with protocol-specific
negotiations and setup. They have access to the Curl_sendf() (from negotiations and setup. They have access to the Curl_sendf() (from
lib/sendf.c) function to send printf-style formatted data to the remote lib/curl_sendf.c) function to send printf-style formatted data to the
host and when they're ready to make the actual file transfer they call the remote host and when they're ready to make the actual file transfer they
Curl_Transfer() function (in lib/transfer.c) to setup the transfer and call the Curl_Transfer() function (in lib/curl_transfer.c) to setup the
returns. transfer and returns.
If this DO function fails and the connection is being re-used, libcurl will If this DO function fails and the connection is being re-used, libcurl will
then close this connection, setup a new connection and re-issue the DO then close this connection, setup a new connection and re-issue the DO
@ -187,13 +187,13 @@ Library
o Transfer() o Transfer()
Curl_perform() then calls Transfer() in lib/transfer.c that performs the Curl_perform() then calls Transfer() in lib/curl_transfer.c that performs
entire file transfer. the entire file transfer.
During transfer, the progress functions in lib/progress.c are called at a During transfer, the progress functions in lib/curl_progress.c are called
frequent interval (or at the user's choice, a specified callback might get at a frequent interval (or at the user's choice, a specified callback
called). The speedcheck functions in lib/speedcheck.c are also used to might get called). The speedcheck functions in lib/curl_speedcheck.c are
verify that the transfer is as fast as required. also used to verify that the transfer is as fast as required.
o Curl_done() o Curl_done()
@ -241,11 +241,11 @@ Library
HTTP(S) HTTP(S)
HTTP offers a lot and is the protocol in curl that uses the most lines of HTTP offers a lot and is the protocol in curl that uses the most lines of
code. There is a special file (lib/formdata.c) that offers all the multipart code. There is a special file (lib/curl_formdata.c) that offers all the
post functions. multipart post functions.
base64-functions for user+password stuff (and more) is in (lib/base64.c) and base64-functions for user+password stuff (and more) is in (lib/curl_base64.c)
all functions for parsing and sending cookies are found in (lib/cookie.c). and all functions for parsing and sending cookies in (lib/curl_cookie.c).
HTTPS uses in almost every means the same procedure as HTTP, with only two HTTPS uses in almost every means the same procedure as HTTP, with only two
exceptions: the connect procedure is different and the function used to read exceptions: the connect procedure is different and the function used to read
@ -253,8 +253,8 @@ Library
the source by the use of Curl_read() for reading and Curl_write() for writing the source by the use of Curl_read() for reading and Curl_write() for writing
data to the remote server. data to the remote server.
http_chunks.c contains functions that understands HTTP 1.1 chunked transfer curl_http_chunks.c contains functions that understands HTTP 1.1 chunked
encoding. transfer encoding.
An interesting detail with the HTTP(S) request, is the Curl_add_buffer() An interesting detail with the HTTP(S) request, is the Curl_add_buffer()
series of functions we use. They append data to one single buffer, and when series of functions we use. They append data to one single buffer, and when
@ -264,7 +264,7 @@ Library
FTP FTP
The Curl_if2ip() function can be used for getting the IP number of a The Curl_if2ip() function can be used for getting the IP number of a
specified network interface, and it resides in lib/if2ip.c. specified network interface, and it resides in lib/curl_if2ip.c.
Curl_ftpsendf() is used for sending FTP commands to the remote server. It was Curl_ftpsendf() is used for sending FTP commands to the remote server. It was
made a separate function to prevent us programmers from forgetting that they made a separate function to prevent us programmers from forgetting that they
@ -273,41 +273,42 @@ Library
Kerberos Kerberos
The kerberos support is mainly in lib/krb4.c and lib/security.c. The kerberos support is mainly in lib/curl_krb4.c and lib/curl_security.c.
TELNET TELNET
Telnet is implemented in lib/telnet.c. Telnet is implemented in lib/curl_telnet.c.
FILE FILE
The file:// protocol is dealt with in lib/file.c. The file:// protocol is dealt with in lib/curl_file.c.
LDAP LDAP
Everything LDAP is in lib/ldap.c and lib/openldap.c Everything LDAP is in lib/curl_ldap.c and lib/curl_openldap.c
GENERAL GENERAL
URL encoding and decoding, called escaping and unescaping in the source code, URL encoding and decoding, called escaping and unescaping in the source code,
is found in lib/escape.c. is found in lib/curl_escape.c.
While transferring data in Transfer() a few functions might get used. While transferring data in Transfer() a few functions might get used.
curl_getdate() in lib/parsedate.c is for HTTP date comparisons (and more). curl_getdate() in lib/curl_parsedate.c is for HTTP date comparisons (and
more).
lib/getenv.c offers curl_getenv() which is for reading environment variables lib/curl_getenv.c offers curl_getenv() which is for reading environment
in a neat platform independent way. That's used in the client, but also in variables in a neat platform independent way. That's used in the client,
lib/url.c when checking the proxy environment variables. Note that contrary but also in lib/curl_url.c when checking the proxy environment variables.
to the normal unix getenv(), this returns an allocated buffer that must be Note that contrary to the normal unix getenv(), this returns an allocated
free()ed after use. buffer that must be free()ed after use.
lib/netrc.c holds the .netrc parser lib/curl_netrc.c holds the .netrc parser
lib/timeval.c features replacement functions for systems that don't have lib/curl_timeval.c features replacement functions for systems that don't have
gettimeofday() and a few support functions for timeval conversions. gettimeofday() and a few support functions for timeval conversions.
A function named curl_version() that returns the full curl version string is A function named curl_version() that returns the full curl version string is
found in lib/version.c. found in lib/curl_version.c.
Persistent Connections Persistent Connections
====================== ======================
@ -411,10 +412,10 @@ API/ABI
Client Client
====== ======
main() resides in src/main.c together with most of the client code. main() resides in src/tool_main.c together with most of the client code.
src/tool_hugehelp.c is automatically generated by the mkhelp.pl perl script src/tool_hugehelp.c is automatically generated by the mkhelp.pl perl script
to display the complete "manual" and the src/urlglob.c file holds the to display the complete "manual" and the src/tool_urlglob.c file holds the
functions used for the URL-"globbing" support. Globbing in the sense that functions used for the URL-"globbing" support. Globbing in the sense that
the {} and [] expansion stuff is there. the {} and [] expansion stuff is there.
@ -423,10 +424,10 @@ Client
control after the curl_easy_perform() it cleans up the library, checks status control after the curl_easy_perform() it cleans up the library, checks status
and exits. and exits.
When the operation is done, the ourWriteOut() function in src/writeout.c may When the operation is done, the ourWriteOut() function in
be called to report about the operation. That function is using the src/tool_writeout.c may be called to report about the operation. That
curl_easy_getinfo() function to extract useful information from the curl function is using the curl_easy_getinfo() function to extract useful
session. information from the curl session.
Recent versions may loop and do all this several times if many URLs were Recent versions may loop and do all this several times if many URLs were
specified on the command line or config file. specified on the command line or config file.
@ -434,12 +435,12 @@ Client
Memory Debugging Memory Debugging
================ ================
The file lib/memdebug.c contains debug-versions of a few functions. Functions The file lib/curl_memdebug.c contains debug-versions of a few functions.
such as malloc, free, fopen, fclose, etc that somehow deal with resources Functions such as malloc, free, fopen, fclose, etc that somehow deal with
that might give us problems if we "leak" them. The functions in the memdebug resources that might give us problems if we "leak" them. The functions in
system do nothing fancy, they do their normal function and then log the memory tracking system do nothing fancy, they do their normal function
information about what they just did. The logged data can then be analyzed and then log information about what they just did. The logged data can then
after a complete session, be analyzed after a complete session,
memanalyze.pl is the perl script present in tests/ that analyzes a log file memanalyze.pl is the perl script present in tests/ that analyzes a log file
generated by the memory tracking system. It detects if resources are generated by the memory tracking system. It detects if resources are

4
docs/TODO
Просмотреть файл

@ -541,8 +541,8 @@ to provide the data to send.
19.1 http-style HEAD output for ftp 19.1 http-style HEAD output for ftp
#undef CURL_FTP_HTTPSTYLE_HEAD in lib/ftp.c to remove the HTTP-style headers #undef CURL_FTP_HTTPSTYLE_HEAD in lib/curl_ftp.c to remove the HTTP-style
from being output in NOBODY requests over ftp headers from being output in NOBODY requests over ftp
19.2 combine error codes 19.2 combine error codes

44
lib/CMakeLists.txt
Просмотреть файл

@ -18,18 +18,18 @@ if(MSVC)
endif() endif()
# SET(CSOURCES # SET(CSOURCES
# # memdebug.c -not used # # curl_memdebug.c -not used
# # nwlib.c - Not used # # curl_nwlib.c - Not used
# # strtok.c - specify later # # curl_strtok.c - specify later
# # strtoofft.c - specify later # # curl_strtoofft.c - specify later
# ) # )
# # if we have Kerberos 4, right now this is never on # # if we have Kerberos 4, right now this is never on
# #OPTION(CURL_KRB4 "Use Kerberos 4" OFF) # #OPTION(CURL_KRB4 "Use Kerberos 4" OFF)
# IF(CURL_KRB4) # IF(CURL_KRB4)
# SET(CSOURCES ${CSOURCES} # SET(CSOURCES ${CSOURCES}
# krb4.c # curl_krb4.c
# security.c # curl_security.c
# ) # )
# ENDIF(CURL_KRB4) # ENDIF(CURL_KRB4)
@ -37,33 +37,33 @@ endif()
# MARK_AS_ADVANCED(CURL_MALLOC_DEBUG) # MARK_AS_ADVANCED(CURL_MALLOC_DEBUG)
# IF(CURL_MALLOC_DEBUG) # IF(CURL_MALLOC_DEBUG)
# SET(CSOURCES ${CSOURCES} # SET(CSOURCES ${CSOURCES}
# memdebug.c # curl_memdebug.c
# ) # )
# ENDIF(CURL_MALLOC_DEBUG) # ENDIF(CURL_MALLOC_DEBUG)
# # only build compat strtoofft if we need to # # only build compat strtoofft if we need to
# IF(NOT HAVE_STRTOLL AND NOT HAVE__STRTOI64) # IF(NOT HAVE_STRTOLL AND NOT HAVE__STRTOI64)
# SET(CSOURCES ${CSOURCES} # SET(CSOURCES ${CSOURCES}
# strtoofft.c # curl_strtoofft.c
# ) # )
# ENDIF(NOT HAVE_STRTOLL AND NOT HAVE__STRTOI64) # ENDIF(NOT HAVE_STRTOLL AND NOT HAVE__STRTOI64)
if(HAVE_FEATURES_H) if(HAVE_FEATURES_H)
set_source_files_properties( set_source_files_properties(
cookie.c curl_cookie.c
easy.c curl_easy.c
formdata.c curl_formdata.c
getenv.c curl_getenv.c
nonblock.c curl_nonblock.c
hash.c curl_hash.c
http.c curl_http.c
if2ip.c curl_if2ip.c
mprintf.c curl_mprintf.c
multi.c curl_multi.c
sendf.c curl_sendf.c
telnet.c curl_telnet.c
transfer.c curl_transfer.c
url.c curl_url.c
COMPILE_FLAGS -D_BSD_SOURCE) COMPILE_FLAGS -D_BSD_SOURCE)
endif(HAVE_FEATURES_H) endif(HAVE_FEATURES_H)

52
lib/Makefile.am
Просмотреть файл

@ -5,7 +5,7 @@
# | (__| |_| | _ <| |___ # | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____| # \___|\___/|_| \_\_____|
# #
# Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. # Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
# #
# This software is licensed as described in the file COPYING, which # This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms # you should have received as part of this distribution. The terms
@ -30,16 +30,46 @@ DOCS = README.encoding README.memoryleak README.ares README.curlx \
CMAKE_DIST = CMakeLists.txt curl_config.h.cmake CMAKE_DIST = CMakeLists.txt curl_config.h.cmake
EXTRA_DIST = Makefile.b32 Makefile.m32 Makefile.vc6 $(DSP) \ EXTRA_DIST = \
vc6libcurl.dsw config-win32.h config-win32ce.h config-riscos.h \ $(CMAKE_DIST) \
config-mac.h curl_config.h.in makefile.dj config-dos.h libcurl.plist \ $(DOCS) \
libcurl.rc config-amigaos.h makefile.amiga \ $(DSP) \
Makefile.netware nwlib.c nwos.c msvcproj.head msvcproj.foot \ $(VCPROJ) \
config-win32ce.h config-os400.h setup-os400.h config-symbian.h \ Makefile.Watcom \
Makefile.Watcom config-tpf.h $(DOCS) $(VCPROJ) mk-ca-bundle.pl \ Makefile.b32 \
mk-ca-bundle.vbs firefox-db2pem.sh $(CMAKE_DIST) config-vxworks.h \ Makefile.m32 \
Makefile.vxworks config-vms.h checksrc.pl objnames-test.sh \ Makefile.netware \
objnames.inc Makefile.vc6 \
Makefile.vxworks \
checksrc.pl \
config-amigaos.h \
config-dos.h \
config-mac.h \
config-os400.h \
config-riscos.h \
config-symbian.h \
config-tpf.h \
config-vms.h \
config-vxworks.h \
config-win32.h \
config-win32ce.h \
config-win32ce.h \
curl_config.h.in \
curl_nwlib.c \
curl_nwos.c \
firefox-db2pem.sh \
libcurl.plist \
libcurl.rc \
makefile.amiga \
makefile.dj \
mk-ca-bundle.pl \
mk-ca-bundle.vbs \
msvcproj.foot \
msvcproj.head \
objnames-test.sh \
objnames.inc \
setup-os400.h \
vc6libcurl.dsw
CLEANFILES = $(DSP) $(VCPROJ) CLEANFILES = $(DSP) $(VCPROJ)

130
lib/Makefile.inc
Просмотреть файл

@ -7,25 +7,115 @@
# CSRC2 = file4.c file5.c file6.c # CSRC2 = file4.c file5.c file6.c
# CSOURCES = $(CSRC1) $(CSRC2) # CSOURCES = $(CSRC1) $(CSRC2)
CSOURCES = file.c timeval.c base64.c hostip.c progress.c formdata.c \ CSOURCES = \
cookie.c http.c sendf.c ftp.c url.c dict.c if2ip.c speedcheck.c \ curl_amigaos.c \
ldap.c ssluse.c version.c getenv.c escape.c mprintf.c telnet.c \ curl_asyn_ares.c \
netrc.c getinfo.c transfer.c strequal.c easy.c security.c krb4.c \ curl_asyn_thread.c \
curl_fnmatch.c fileinfo.c ftplistparser.c wildcard.c krb5.c \ curl_axtls.c \
memdebug.c http_chunks.c strtok.c connect.c llist.c hash.c multi.c \ curl_base64.c \
content_encoding.c share.c http_digest.c md4.c md5.c curl_rand.c \ curl_bundles.c \
http_negotiate.c inet_pton.c strtoofft.c strerror.c amigaos.c \ curl_conncache.c \
hostasyn.c hostip4.c hostip6.c hostsyn.c inet_ntop.c parsedate.c \ curl_connect.c \
select.c gtls.c sslgen.c tftp.c splay.c strdup.c socks.c ssh.c nss.c \ curl_content_encoding.c \
qssl.c rawstr.c curl_addrinfo.c socks_gssapi.c socks_sspi.c \ curl_cookie.c \
curl_sspi.c slist.c nonblock.c curl_memrchr.c imap.c pop3.c smtp.c \ curl_addrinfo.c \
pingpong.c rtsp.c curl_threads.c warnless.c hmac.c polarssl.c \ curl_darwinssl.c \
curl_rtmp.c openldap.c curl_gethostname.c gopher.c axtls.c \ curl_fnmatch.c \
idn_win32.c http_negotiate_sspi.c cyassl.c http_proxy.c non-ascii.c \ curl_gethostname.c \
asyn-ares.c asyn-thread.c curl_gssapi.c curl_ntlm.c curl_ntlm_wb.c \ curl_gssapi.c \
curl_ntlm_core.c curl_ntlm_msgs.c curl_sasl.c curl_schannel.c \ curl_memrchr.c \
curl_multibyte.c curl_darwinssl.c hostcheck.c \ curl_multibyte.c \
bundles.c conncache.c curl_ntlm.c \
curl_ntlm_core.c \
curl_ntlm_msgs.c \
curl_ntlm_wb.c \
curl_rand.c \
curl_rtmp.c \
curl_sasl.c \
curl_schannel.c \
curl_sspi.c \
curl_threads.c \
curl_cyassl.c \
curl_dict.c \
curl_easy.c \
curl_escape.c \
curl_file.c \
curl_fileinfo.c \
curl_formdata.c \
curl_ftp.c \
curl_ftplistparser.c \
curl_getenv.c \
curl_getinfo.c \
curl_gopher.c \
curl_gtls.c \
curl_hash.c \
curl_hmac.c \
curl_hostasyn.c \
curl_hostcheck.c \
curl_hostip.c \
curl_hostip4.c \
curl_hostip6.c \
curl_hostsyn.c \
curl_http.c \
curl_http_chunks.c \
curl_http_digest.c \
curl_http_negotiate.c \
curl_http_negotiate_sspi.c \
curl_http_proxy.c \
curl_idn_win32.c \
curl_if2ip.c \
curl_imap.c \
curl_inet_ntop.c \
curl_inet_pton.c \
curl_krb4.c \
curl_krb5.c \
curl_ldap.c \
curl_llist.c \
curl_md4.c \
curl_md5.c \
curl_memdebug.c \
curl_mprintf.c \
curl_multi.c \
curl_netrc.c \
curl_non_ascii.c \
curl_nonblock.c \
curl_nss.c \
curl_openldap.c \
curl_parsedate.c \
curl_pingpong.c \
curl_polarssl.c \
curl_pop3.c \
curl_progress.c \
curl_qssl.c \
curl_rawstr.c \
curl_rtsp.c \
curl_security.c \
curl_select.c \
curl_sendf.c \
curl_share.c \
curl_slist.c \
curl_smtp.c \
curl_socks.c \
curl_socks_gssapi.c \
curl_socks_sspi.c \
curl_speedcheck.c \
curl_splay.c \
curl_ssh.c \
curl_sslgen.c \
curl_ssluse.c \
curl_strdup.c \
curl_strequal.c \
curl_strerror.c \
curl_strtok.c \
curl_strtoofft.c \
curl_telnet.c \
curl_tftp.c \
curl_timeval.c \
curl_transfer.c \
curl_url.c \
curl_version.c \
curl_warnless.c \
curl_wildcard.c
HHEADERS = \ HHEADERS = \
curl_addrinfo.h \ curl_addrinfo.h \
@ -79,7 +169,7 @@ HHEADERS = \
curl_multibyte.h \ curl_multibyte.h \
curl_multiif.h \ curl_multiif.h \
curl_netrc.h \ curl_netrc.h \
curl_non-ascii.h \ curl_non_ascii.h \
curl_nonblock.h \ curl_nonblock.h \
curl_nssg.h \ curl_nssg.h \
curl_ntlm.h \ curl_ntlm.h \

162
lib/Makefile.vc6
Просмотреть файл

@ -5,7 +5,7 @@
# | (__| |_| | _ <| |___ # | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____| # \___|\___/|_| \_\_____|
# #
# Copyright (C) 1999 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. # Copyright (C) 1999 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
# #
# This software is licensed as described in the file COPYING, which # This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms # you should have received as part of this distribution. The terms
@ -494,14 +494,14 @@ clean:
# A config was provided, so the library can be built. # A config was provided, so the library can be built.
# #
X_OBJS= \ X_OBJS= \
$(DIROBJ)\asyn-ares.obj \ $(DIROBJ)\curl_asyn_ares.obj \
$(DIROBJ)\asyn-thread.obj \ $(DIROBJ)\curl_asyn_thread.obj \
$(DIROBJ)\base64.obj \ $(DIROBJ)\curl_base64.obj \
$(DIROBJ)\bundles.obj \ $(DIROBJ)\curl_bundles.obj \
$(DIROBJ)\conncache.obj \ $(DIROBJ)\curl_conncache.obj \
$(DIROBJ)\connect.obj \ $(DIROBJ)\curl_connect.obj \
$(DIROBJ)\content_encoding.obj \ $(DIROBJ)\curl_content_encoding.obj \
$(DIROBJ)\cookie.obj \ $(DIROBJ)\curl_cookie.obj \
$(DIROBJ)\curl_addrinfo.obj \ $(DIROBJ)\curl_addrinfo.obj \
$(DIROBJ)\curl_darwinssl.obj \ $(DIROBJ)\curl_darwinssl.obj \
$(DIROBJ)\curl_fnmatch.obj \ $(DIROBJ)\curl_fnmatch.obj \
@ -518,78 +518,78 @@ X_OBJS= \
$(DIROBJ)\curl_schannel.obj \ $(DIROBJ)\curl_schannel.obj \
$(DIROBJ)\curl_sspi.obj \ $(DIROBJ)\curl_sspi.obj \
$(DIROBJ)\curl_threads.obj \ $(DIROBJ)\curl_threads.obj \
$(DIROBJ)\dict.obj \ $(DIROBJ)\curl_dict.obj \
$(DIROBJ)\easy.obj \ $(DIROBJ)\curl_easy.obj \
$(DIROBJ)\escape.obj \ $(DIROBJ)\curl_escape.obj \
$(DIROBJ)\file.obj \ $(DIROBJ)\curl_file.obj \
$(DIROBJ)\fileinfo.obj \ $(DIROBJ)\curl_fileinfo.obj \
$(DIROBJ)\formdata.obj \ $(DIROBJ)\curl_formdata.obj \
$(DIROBJ)\ftp.obj \ $(DIROBJ)\curl_ftp.obj \
$(DIROBJ)\ftplistparser.obj \ $(DIROBJ)\curl_ftplistparser.obj \
$(DIROBJ)\getenv.obj \ $(DIROBJ)\curl_getenv.obj \
$(DIROBJ)\getinfo.obj \ $(DIROBJ)\curl_getinfo.obj \
$(DIROBJ)\gopher.obj \ $(DIROBJ)\curl_gopher.obj \
$(DIROBJ)\gtls.obj \ $(DIROBJ)\curl_gtls.obj \
$(DIROBJ)\hash.obj \ $(DIROBJ)\curl_hash.obj \
$(DIROBJ)\hmac.obj \ $(DIROBJ)\curl_hmac.obj \
$(DIROBJ)\hostasyn.obj \ $(DIROBJ)\curl_hostasyn.obj \
$(DIROBJ)\hostcheck.obj \ $(DIROBJ)\curl_hostcheck.obj \
$(DIROBJ)\hostip.obj \ $(DIROBJ)\curl_hostip.obj \
$(DIROBJ)\hostip4.obj \ $(DIROBJ)\curl_hostip4.obj \
$(DIROBJ)\hostip6.obj \ $(DIROBJ)\curl_hostip6.obj \
$(DIROBJ)\hostsyn.obj \ $(DIROBJ)\curl_hostsyn.obj \
$(DIROBJ)\http.obj \ $(DIROBJ)\curl_http.obj \
$(DIROBJ)\http_chunks.obj \ $(DIROBJ)\curl_http_chunks.obj \
$(DIROBJ)\http_digest.obj \ $(DIROBJ)\curl_http_digest.obj \
$(DIROBJ)\http_negotiate.obj \ $(DIROBJ)\curl_http_negotiate.obj \
$(DIROBJ)\http_negotiate_sspi.obj \ $(DIROBJ)\curl_http_negotiate_sspi.obj \
$(DIROBJ)\http_proxy.obj \ $(DIROBJ)\curl_http_proxy.obj \
$(DIROBJ)\if2ip.obj \ $(DIROBJ)\curl_if2ip.obj \
$(DIROBJ)\imap.obj \ $(DIROBJ)\curl_imap.obj \
$(DIROBJ)\inet_ntop.obj \ $(DIROBJ)\curl_inet_ntop.obj \
$(DIROBJ)\inet_pton.obj \ $(DIROBJ)\curl_inet_pton.obj \
$(DIROBJ)\ldap.obj \ $(DIROBJ)\curl_ldap.obj \
$(DIROBJ)\llist.obj \ $(DIROBJ)\curl_llist.obj \
$(DIROBJ)\md4.obj \ $(DIROBJ)\curl_md4.obj \
$(DIROBJ)\md5.obj \ $(DIROBJ)\curl_md5.obj \
$(DIROBJ)\memdebug.obj \ $(DIROBJ)\curl_memdebug.obj \
$(DIROBJ)\mprintf.obj \ $(DIROBJ)\curl_mprintf.obj \
$(DIROBJ)\multi.obj \ $(DIROBJ)\curl_multi.obj \
$(DIROBJ)\netrc.obj \ $(DIROBJ)\curl_netrc.obj \
$(DIROBJ)\nonblock.obj \ $(DIROBJ)\curl_nonblock.obj \
$(DIROBJ)\openldap.obj \ $(DIROBJ)\curl_openldap.obj \
$(DIROBJ)\parsedate.obj \ $(DIROBJ)\curl_parsedate.obj \
$(DIROBJ)\pingpong.obj \ $(DIROBJ)\curl_pingpong.obj \
$(DIROBJ)\polarssl.obj \ $(DIROBJ)\curl_polarssl.obj \
$(DIROBJ)\pop3.obj \ $(DIROBJ)\curl_pop3.obj \
$(DIROBJ)\progress.obj \ $(DIROBJ)\curl_progress.obj \
$(DIROBJ)\rawstr.obj \ $(DIROBJ)\curl_rawstr.obj \
$(DIROBJ)\rtsp.obj \ $(DIROBJ)\curl_rtsp.obj \
$(DIROBJ)\select.obj \ $(DIROBJ)\curl_select.obj \
$(DIROBJ)\sendf.obj \ $(DIROBJ)\curl_sendf.obj \
$(DIROBJ)\share.obj \ $(DIROBJ)\curl_share.obj \
$(DIROBJ)\slist.obj \ $(DIROBJ)\curl_slist.obj \
$(DIROBJ)\smtp.obj \ $(DIROBJ)\curl_smtp.obj \
$(DIROBJ)\socks.obj \ $(DIROBJ)\curl_socks.obj \
$(DIROBJ)\socks_gssapi.obj \ $(DIROBJ)\curl_socks_gssapi.obj \
$(DIROBJ)\socks_sspi.obj \ $(DIROBJ)\curl_socks_sspi.obj \
$(DIROBJ)\speedcheck.obj \ $(DIROBJ)\curl_speedcheck.obj \
$(DIROBJ)\splay.obj \ $(DIROBJ)\curl_splay.obj \
$(DIROBJ)\ssh.obj \ $(DIROBJ)\curl_ssh.obj \
$(DIROBJ)\sslgen.obj \ $(DIROBJ)\curl_sslgen.obj \
$(DIROBJ)\ssluse.obj \ $(DIROBJ)\curl_ssluse.obj \
$(DIROBJ)\strequal.obj \ $(DIROBJ)\curl_strequal.obj \
$(DIROBJ)\strerror.obj \ $(DIROBJ)\curl_strerror.obj \
$(DIROBJ)\strtok.obj \ $(DIROBJ)\curl_strtok.obj \
$(DIROBJ)\strtoofft.obj \ $(DIROBJ)\curl_strtoofft.obj \
$(DIROBJ)\telnet.obj \ $(DIROBJ)\curl_telnet.obj \
$(DIROBJ)\tftp.obj \ $(DIROBJ)\curl_tftp.obj \
$(DIROBJ)\timeval.obj \ $(DIROBJ)\curl_timeval.obj \
$(DIROBJ)\transfer.obj \ $(DIROBJ)\curl_transfer.obj \
$(DIROBJ)\url.obj \ $(DIROBJ)\curl_url.obj \
$(DIROBJ)\version.obj \ $(DIROBJ)\curl_version.obj \
$(DIROBJ)\warnless.obj \ $(DIROBJ)\curl_warnless.obj \
$(DIROBJ)\wildcard.obj \ $(DIROBJ)\curl_wildcard.obj \
$(RESOURCE) $(RESOURCE)
all : $(TARGET) all : $(TARGET)

2
lib/README.curlx
Просмотреть файл

@ -19,7 +19,7 @@ We provide them through a single header file for easy access for apps:
A macro that converts a string containing a number to a curl_off_t number. A macro that converts a string containing a number to a curl_off_t number.
This might use the curlx_strtoll() function which is provided as source This might use the curlx_strtoll() function which is provided as source
code in strtoofft.c. Note that the function is only provided if no code in curl_strtoofft.c. Note that the function is only provided if no
strtoll() (or equivalent) function exist on your platform. If curl_off_t strtoll() (or equivalent) function exist on your platform. If curl_off_t
is only a 32 bit number on your platform, this macro uses strtol(). is only a 32 bit number on your platform, this macro uses strtol().

20
lib/README.hostip
Просмотреть файл

@ -1,7 +1,7 @@
hostip.c explained curl_hostip.c explained
================== ==================
The main COMPILE-TIME DEFINES to keep in mind when reading the host*.c The main COMPILE-TIME DEFINES to keep in mind when reading the curl_host*.c
source file are these: source file are these:
CURLRES_IPV6 - this host has getaddrinfo() and family, and thus we use CURLRES_IPV6 - this host has getaddrinfo() and family, and thus we use
@ -21,15 +21,15 @@
libcurl is not built to use an asynchronous resolver, CURLRES_SYNCH is libcurl is not built to use an asynchronous resolver, CURLRES_SYNCH is
defined. defined.
The host*.c sources files are split up like this: The curl_host*.c sources files are split up like this:
hostip.c - method-independent resolver functions and utility functions curl_hostip.c - method-independent resolver functions and utility functions
hostasyn.c - functions for asynchronous name resolves curl_hostasyn.c - functions for asynchronous name resolves
hostsyn.c - functions for synchronous name resolves curl_hostsyn.c - functions for synchronous name resolves
hostares.c - functions for ares-using name resolves curl_hostares.c - functions for ares-using name resolves
hostthre.c - functions for threaded name resolves curl_hostthre.c - functions for threaded name resolves
hostip4.c - ipv4-specific functions curl_hostip4.c - ipv4-specific functions
hostip6.c - ipv6-specific functions curl_hostip6.c - ipv6-specific functions
The curl_hostip.h is the single united header file for all this. It defines The curl_hostip.h is the single united header file for all this. It defines
the CURLRES_* defines based on the config*.h and curl_setup.h defines. the CURLRES_* defines based on the config*.h and curl_setup.h defines.

32
lib/axtls.c
Просмотреть файл

@ -5,8 +5,8 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 2010, DirecTV * Copyright (C) 2010, DirecTV * contact: Eric Hu <ehu@directv.com>
* contact: Eric Hu <ehu@directv.com> * Copyright (C) 2010 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -23,7 +23,7 @@
/* /*
* Source file for all axTLS-specific code for the TLS/SSL layer. No code * Source file for all axTLS-specific code for the TLS/SSL layer. No code
* but sslgen.c should ever call or use these functions. * but curl_sslgen.c should ever call or use these functions.
*/ */
#include "curl_setup.h" #include "curl_setup.h"
@ -199,7 +199,7 @@ Curl_axtls_connect(struct connectdata *conn,
infof(data, "found certificates in %s\n", data->set.ssl.CAfile); infof(data, "found certificates in %s\n", data->set.ssl.CAfile);
} }
/* gtls.c tasks we're skipping for now: /* curl_gtls.c tasks we're skipping for now:
* 1) certificate revocation list checking * 1) certificate revocation list checking
* 2) dns name assignment to host * 2) dns name assignment to host
* 3) set protocol priority. axTLS is TLSv1 only, so can probably ignore * 3) set protocol priority. axTLS is TLSv1 only, so can probably ignore
@ -255,7 +255,7 @@ Curl_axtls_connect(struct connectdata *conn,
} }
} }
/* gtls.c does more here that is being left out for now /* curl_gtls.c does more here that is being left out for now
* 1) set session credentials. can probably ignore since axtls puts this * 1) set session credentials. can probably ignore since axtls puts this
* info in the ssl_ctx struct * info in the ssl_ctx struct
* 2) setting up callbacks. these seem gnutls specific * 2) setting up callbacks. these seem gnutls specific
@ -280,7 +280,7 @@ Curl_axtls_connect(struct connectdata *conn,
} }
infof (data, "handshake completed successfully\n"); infof (data, "handshake completed successfully\n");
/* Here, gtls.c gets the peer certificates and fails out depending on /* Here, curl_gtls.c gets the peer certificates and fails out depending on
* settings in "data." axTLS api doesn't have get cert chain fcn, so omit? * settings in "data." axTLS api doesn't have get cert chain fcn, so omit?
*/ */
@ -295,10 +295,10 @@ Curl_axtls_connect(struct connectdata *conn,
else else
infof(data, "\t server certificate verification SKIPPED\n"); infof(data, "\t server certificate verification SKIPPED\n");
/* Here, gtls.c does issuer verification. axTLS has no straightforward /* Here, curl_gtls.c does issuer verification. axTLS has no straightforward
* equivalent, so omitting for now.*/ * equivalent, so omitting for now.*/
/* Here, gtls.c does the following /* Here, curl_gtls.c does the following
* 1) x509 hostname checking per RFC2818. axTLS doesn't support this, but * 1) x509 hostname checking per RFC2818. axTLS doesn't support this, but
* it seems useful. This is now implemented, by Oscar Koeroo * it seems useful. This is now implemented, by Oscar Koeroo
* 2) checks cert validity based on time. axTLS does this in ssl_verify_cert * 2) checks cert validity based on time. axTLS does this in ssl_verify_cert
@ -408,10 +408,10 @@ void Curl_axtls_close(struct connectdata *conn, int sockindex)
infof(conn->data, " Curl_axtls_close\n"); infof(conn->data, " Curl_axtls_close\n");
if(connssl->ssl) { if(connssl->ssl) {
/* line from ssluse.c: (void)SSL_shutdown(connssl->ssl); /* line from curl_ssluse.c: (void)SSL_shutdown(connssl->ssl);
axTLS compat layer does nothing for SSL_shutdown */ axTLS compat layer does nothing for SSL_shutdown */
/* The following line is from ssluse.c. There seems to be no axTLS /* The following line is from curl_ssluse.c. There seems to be no axTLS
equivalent. ssl_free and ssl_ctx_free close things. equivalent. ssl_free and ssl_ctx_free close things.
SSL_set_connect_state(connssl->handle); */ SSL_set_connect_state(connssl->handle); */
@ -430,8 +430,9 @@ void Curl_axtls_close(struct connectdata *conn, int sockindex)
*/ */
int Curl_axtls_shutdown(struct connectdata *conn, int sockindex) int Curl_axtls_shutdown(struct connectdata *conn, int sockindex)
{ {
/* Outline taken from ssluse.c since functions are in axTLS compat layer. /* Outline taken from curl_ssluse.c since functions are in axTLS compat
axTLS's error set is much smaller, so a lot of error-handling was removed. layer. axTLS's error set is much smaller, so a lot of error-handling
was removed.
*/ */
int retval = 0; int retval = 0;
struct ssl_connect_data *connssl = &conn->ssl[sockindex]; struct ssl_connect_data *connssl = &conn->ssl[sockindex];
@ -521,7 +522,8 @@ static ssize_t axtls_recv(struct connectdata *conn, /* connection data */
*/ */
int Curl_axtls_check_cxn(struct connectdata *conn) int Curl_axtls_check_cxn(struct connectdata *conn)
{ {
/* ssluse.c line: rc = SSL_peek(conn->ssl[FIRSTSOCKET].ssl, (void*)&buf, 1); /* curl_ssluse.c line:
rc = SSL_peek(conn->ssl[FIRSTSOCKET].ssl, (void*)&buf, 1);
axTLS compat layer always returns the last argument, so connection is axTLS compat layer always returns the last argument, so connection is
always alive? */ always alive? */
@ -533,8 +535,8 @@ void Curl_axtls_session_free(void *ptr)
{ {
(void)ptr; (void)ptr;
/* free the ID */ /* free the ID */
/* both ssluse.c and gtls.c do something here, but axTLS's OpenSSL /* both curl_ssluse.c and curl_gtls.c do something here, but axTLS's
compatibility layer does nothing, so we do nothing too. */ OpenSSL compatibility layer does nothing, so we do nothing too. */
} }
size_t Curl_axtls_version(char *buffer, size_t size) size_t Curl_axtls_version(char *buffer, size_t size)

4
lib/base64.c
Просмотреть файл

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -31,7 +31,7 @@
#include "curl_warnless.h" #include "curl_warnless.h"
#include "curl_base64.h" #include "curl_base64.h"
#include "curl_memory.h" #include "curl_memory.h"
#include "curl_non-ascii.h" #include "curl_non_ascii.h"
/* include curl_memdebug.h last */ /* include curl_memdebug.h last */
#include "curl_memdebug.h" #include "curl_memdebug.h"

10
lib/curl_addrinfo.c
Просмотреть файл

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -482,8 +482,8 @@ Curl_addrinfo *Curl_str2addr(char *address, int port)
* curl_dofreeaddrinfo() * curl_dofreeaddrinfo()
* *
* This is strictly for memory tracing and are using the same style as the * This is strictly for memory tracing and are using the same style as the
* family otherwise present in memdebug.c. I put these ones here since they * family otherwise present in curl_memdebug.c. I put these ones here since
* require a bunch of structs I didn't want to include in memdebug.c * they require a bunch of structs I didn't want to include there.
*/ */
void void
@ -502,8 +502,8 @@ curl_dofreeaddrinfo(struct addrinfo *freethis,
* curl_dogetaddrinfo() * curl_dogetaddrinfo()
* *
* This is strictly for memory tracing and are using the same style as the * This is strictly for memory tracing and are using the same style as the
* family otherwise present in memdebug.c. I put these ones here since they * family otherwise present in curl_memdebug.c. I put these ones here since
* require a bunch of structs I didn't want to include in memdebug.c * they require a bunch of structs I didn't want to include there.
*/ */
int int

6
lib/curl_asyn.h
Просмотреть файл

@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -34,8 +34,8 @@ struct Curl_dns_entry;
/* /*
* This header defines all functions in the internal asynch resolver interface. * This header defines all functions in the internal asynch resolver interface.
* All asynch resolvers need to provide these functions. * All asynch resolvers need to provide these functions.
* asyn-ares.c and asyn-thread.c are the current implementations of asynch * curl_asyn_ares.c and curl_asyn_thread.c are the current implementations of
* resolver backends. * asynch resolver backends.
*/ */
/* /*

5
lib/curl_darwinssl.c
Просмотреть файл

@ -6,7 +6,7 @@
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 2012, Nick Zitzmann, <nickzman@gmail.com>. * Copyright (C) 2012, Nick Zitzmann, <nickzman@gmail.com>.
* Copyright (C) 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 2012 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -23,7 +23,8 @@
/* /*
* Source file for all iOS and Mac OS X SecureTransport-specific code for the * Source file for all iOS and Mac OS X SecureTransport-specific code for the
* TLS/SSL layer. No code but sslgen.c should ever call or use these functions. * TLS/SSL layer. No code but curl_sslgen.c should ever call or use these
* functions.
*/ */
#include "curl_setup.h" #include "curl_setup.h"

4
lib/curl_easyif.h
Просмотреть файл

@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -23,7 +23,7 @@
***************************************************************************/ ***************************************************************************/
/* /*
* Prototypes for library-wide functions provided by easy.c * Prototypes for library-wide functions provided by curl_easy.c
*/ */
void Curl_easy_addmulti(struct SessionHandle *data, void *multi); void Curl_easy_addmulti(struct SessionHandle *data, void *multi);

6
lib/curl_ftp.h
Просмотреть файл

@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -79,7 +79,7 @@ typedef enum {
FTP_LAST /* never used */ FTP_LAST /* never used */
} ftpstate; } ftpstate;
struct ftp_parselist_data; /* defined later in ftplistparser.c */ struct ftp_parselist_data; /* defined later in curl_ftplistparser.c */
struct ftp_wc_tmpdata { struct ftp_wc_tmpdata {
struct ftp_parselist_data *parser; struct ftp_parselist_data *parser;
@ -146,7 +146,7 @@ struct ftp_conn {
int count1; /* general purpose counter for the state machine */ int count1; /* general purpose counter for the state machine */
int count2; /* general purpose counter for the state machine */ int count2; /* general purpose counter for the state machine */
int count3; /* general purpose counter for the state machine */ int count3; /* general purpose counter for the state machine */
ftpstate state; /* always use ftp.c:state() to change state! */ ftpstate state; /* always use curl_ftp.c:state() to change state! */
ftpstate state_saved; /* transfer type saved to be reloaded after ftpstate state_saved; /* transfer type saved to be reloaded after
data connection is established */ data connection is established */
curl_off_t retr_size_saved; /* Size of retrieved file saved */ curl_off_t retr_size_saved; /* Size of retrieved file saved */

4
lib/curl_hostip.h
Просмотреть файл

@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -187,7 +187,7 @@ Curl_cache_addr(struct SessionHandle *data, Curl_addrinfo *addr,
#endif #endif
#ifdef HAVE_SIGSETJMP #ifdef HAVE_SIGSETJMP
/* Forward-declaration of variable defined in hostip.c. Beware this /* Forward-declaration of variable defined in curl_hostip.c. Beware this
* is a global and unique instance. This is used to store the return * is a global and unique instance. This is used to store the return
* address that we can jump back to from inside a signal handler. * address that we can jump back to from inside a signal handler.
* This is not thread-safe stuff. * This is not thread-safe stuff.

6
lib/curl_http.h
Просмотреть файл

@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -67,12 +67,12 @@ CURLcode Curl_http(struct connectdata *conn, bool *done);
CURLcode Curl_http_done(struct connectdata *, CURLcode, bool premature); CURLcode Curl_http_done(struct connectdata *, CURLcode, bool premature);
CURLcode Curl_http_connect(struct connectdata *conn, bool *done); CURLcode Curl_http_connect(struct connectdata *conn, bool *done);
/* The following functions are defined in http_chunks.c */ /* The following functions are defined in curl_http_chunks.c */
void Curl_httpchunk_init(struct connectdata *conn); void Curl_httpchunk_init(struct connectdata *conn);
CHUNKcode Curl_httpchunk_read(struct connectdata *conn, char *datap, CHUNKcode Curl_httpchunk_read(struct connectdata *conn, char *datap,
ssize_t length, ssize_t *wrote); ssize_t length, ssize_t *wrote);
/* These functions are in http.c */ /* These functions are in curl_http.c */
void Curl_http_auth_stage(struct SessionHandle *data, int stage); void Curl_http_auth_stage(struct SessionHandle *data, int stage);
CURLcode Curl_http_input_auth(struct connectdata *conn, CURLcode Curl_http_input_auth(struct connectdata *conn,
int httpcode, const char *header); int httpcode, const char *header);

4
lib/curl_imap.h
Просмотреть файл

@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 2009 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 2009 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -46,7 +46,7 @@ typedef enum {
struct imap_conn { struct imap_conn {
struct pingpong pp; struct pingpong pp;
char *mailbox; /* Message ID to fetch */ char *mailbox; /* Message ID to fetch */
imapstate state; /* Always use imap.c:state() to change state! */ imapstate state; /* Always use curl_imap.c:state() to change state! */
int cmdid; /* Next command ID */ int cmdid; /* Next command ID */
const char *idstr; /* String based response ID to wait for */ const char *idstr; /* String based response ID to wait for */
bool ssldone; /* Is connect() over SSL done? Only relevant in bool ssldone; /* Is connect() over SSL done? Only relevant in

4
lib/curl_multiif.h
Просмотреть файл

@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -23,7 +23,7 @@
***************************************************************************/ ***************************************************************************/
/* /*
* Prototypes for library-wide functions provided by multi.c * Prototypes for library-wide functions provided by curl_multi.c
*/ */
void Curl_expire(struct SessionHandle *data, long milli); void Curl_expire(struct SessionHandle *data, long milli);

5
lib/curl_nssg.h
Просмотреть файл

@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -25,7 +25,8 @@
#ifdef USE_NSS #ifdef USE_NSS
/* /*
* This header should only be needed to get included by sslgen.c and nss.c * This header should only be needed to get included by curl_sslgen.c and
* curl_nss.c
*/ */
#include "curl_urldata.h" #include "curl_urldata.h"

4
lib/curl_ntlm_core.c
Просмотреть файл

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -92,7 +92,7 @@
#endif #endif
#include "curl_urldata.h" #include "curl_urldata.h"
#include "curl_non-ascii.h" #include "curl_non_ascii.h"
#include "curl_rawstr.h" #include "curl_rawstr.h"
#include "curl_memory.h" #include "curl_memory.h"
#include "curl_ntlm_core.h" #include "curl_ntlm_core.h"

4
lib/curl_ntlm_msgs.c
Просмотреть файл

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -34,7 +34,7 @@
#define DEBUG_ME 0 #define DEBUG_ME 0
#include "curl_urldata.h" #include "curl_urldata.h"
#include "curl_non-ascii.h" #include "curl_non_ascii.h"
#include "curl_sendf.h" #include "curl_sendf.h"
#include "curl_base64.h" #include "curl_base64.h"
#include "curl_ntlm_core.h" #include "curl_ntlm_core.h"

4
lib/curl_pop3.h
Просмотреть файл

@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 2009 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 2009 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -62,7 +62,7 @@ struct pop3_conn {
unsigned int authmechs; /* Accepted SASL authentication mechanisms */ unsigned int authmechs; /* Accepted SASL authentication mechanisms */
unsigned int authused; /* SASL auth mechanism used for the connection */ unsigned int authused; /* SASL auth mechanism used for the connection */
char *apoptimestamp; /* APOP timestamp from the server greeting */ char *apoptimestamp; /* APOP timestamp from the server greeting */
pop3state state; /* Always use pop3.c:state() to change state! */ pop3state state; /* Always use curl_pop3.c:state() to change state */
}; };
extern const struct Curl_handler Curl_handler_pop3; extern const struct Curl_handler Curl_handler_pop3;

5
lib/curl_qssl.h
Просмотреть файл

@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -24,7 +24,8 @@
#include "curl_setup.h" #include "curl_setup.h"
/* /*
* This header should only be needed to get included by sslgen.c and qssl.c * This header should only be needed to get included by curl_sslgen.c and
* curl_qssl.c
*/ */
#include "curl_urldata.h" #include "curl_urldata.h"

4
lib/curl_schannel.c
Просмотреть файл

@ -7,7 +7,7 @@
* *
* Copyright (C) 2012, Marc Hoersken, <info@marc-hoersken.de>, et al. * Copyright (C) 2012, Marc Hoersken, <info@marc-hoersken.de>, et al.
* Copyright (C) 2012, Mark Salisbury, <mark.salisbury@hp.com> * Copyright (C) 2012, Mark Salisbury, <mark.salisbury@hp.com>
* Copyright (C) 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 2012 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -24,7 +24,7 @@
/* /*
* Source file for all SChannel-specific code for the TLS/SSL layer. No code * Source file for all SChannel-specific code for the TLS/SSL layer. No code
* but sslgen.c should ever call or use these functions. * but curl_sslgen.c should ever call or use these functions.
* *
*/ */

4
lib/curl_smtp.h
Просмотреть файл

@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 2009 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 2009 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -62,7 +62,7 @@ struct smtp_conn {
have been received so far */ have been received so far */
unsigned int authmechs; /* Accepted authentication mechanisms */ unsigned int authmechs; /* Accepted authentication mechanisms */
unsigned int authused; /* Auth mechanism used for the connection */ unsigned int authused; /* Auth mechanism used for the connection */
smtpstate state; /* Always use smtp.c:state() to change state! */ smtpstate state; /* Always use curl_smtp.c:state() to change */
struct curl_slist *rcpt; /* Recipient list */ struct curl_slist *rcpt; /* Recipient list */
bool ssldone; /* Is connect() over SSL done? Only relevant in bool ssldone; /* Is connect() over SSL done? Only relevant in
multi mode */ multi mode */

4
lib/curl_ssh.h
Просмотреть файл

@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -111,7 +111,7 @@ struct ssh_conn {
char *rsa_pub; /* path name */ char *rsa_pub; /* path name */
char *rsa; /* path name */ char *rsa; /* path name */
bool authed; /* the connection has been authenticated fine */ bool authed; /* the connection has been authenticated fine */
sshstate state; /* always use ssh.c:state() to change state! */ sshstate state; /* always use curl_ssh.c:state() to change */
sshstate nextstate; /* the state to goto after stopping */ sshstate nextstate; /* the state to goto after stopping */
CURLcode actualcode; /* the actual error code */ CURLcode actualcode; /* the actual error code */
struct curl_slist *quote_item; /* for the quote option */ struct curl_slist *quote_item; /* for the quote option */

5
lib/curl_ssluse.h
Просмотреть файл

@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -26,7 +26,8 @@
#ifdef USE_SSLEAY #ifdef USE_SSLEAY
/* /*
* This header should only be needed to get included by sslgen.c and ssluse.c * This header should only be needed to get included by curl_sslgen.c and
* curl_ssluse.c
*/ */
#include "curl_urldata.h" #include "curl_urldata.h"

4
lib/curl_url.h
Просмотреть файл

@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -24,7 +24,7 @@
#include "curl_setup.h" #include "curl_setup.h"
/* /*
* Prototypes for library-wide functions provided by url.c * Prototypes for library-wide functions provided by curl_url.c
*/ */
CURLcode Curl_open(struct SessionHandle **curl); CURLcode Curl_open(struct SessionHandle **curl);

14
lib/curl_urldata.h
Просмотреть файл

@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -664,7 +664,7 @@ struct SingleRequest {
bool forbidchunk; /* used only to explicitly forbid chunk-upload for bool forbidchunk; /* used only to explicitly forbid chunk-upload for
specific upload buffers. See readmoredata() in specific upload buffers. See readmoredata() in
http.c for details. */ curl_http.c for details. */
}; };
/* /*
@ -731,8 +731,8 @@ struct Curl_handler {
*/ */
CURLcode (*disconnect)(struct connectdata *, bool dead_connection); CURLcode (*disconnect)(struct connectdata *, bool dead_connection);
/* If used, this function gets called from transfer.c:readwrite_data() to /* If used, this function gets called from curl_transfer.c:readwrite_data()
allow the protocol to do extra reads/writes */ to allow the protocol to do extra reads/writes */
CURLcode (*readwrite)(struct SessionHandle *data, struct connectdata *conn, CURLcode (*readwrite)(struct SessionHandle *data, struct connectdata *conn,
ssize_t *nread, bool *readmore); ssize_t *nread, bool *readmore);
@ -1276,7 +1276,7 @@ struct UrlState {
struct FTP *ftp; struct FTP *ftp;
/* void *tftp; not used */ /* void *tftp; not used */
struct FILEPROTO *file; struct FILEPROTO *file;
void *telnet; /* private for telnet.c-eyes only */ void *telnet; /* private for curl_telnet.c-eyes only */
void *generic; void *generic;
struct SSHPROTO *ssh; struct SSHPROTO *ssh;
struct FTP *imap; struct FTP *imap;
@ -1317,8 +1317,8 @@ struct DynamicStatic {
* the 'DynamicStatic' struct. * the 'DynamicStatic' struct.
* Character pointer fields point to dynamic storage, unless otherwise stated. * Character pointer fields point to dynamic storage, unless otherwise stated.
*/ */
struct Curl_one_easy; /* declared and used only in multi.c */ struct Curl_one_easy; /* declared and used only in curl_multi.c */
struct Curl_multi; /* declared and used only in multi.c */ struct Curl_multi; /* declared and used only in curl_multi.c */
enum dupstring { enum dupstring {
STRING_CERT, /* client certificate file name */ STRING_CERT, /* client certificate file name */

4
lib/cyassl.c
Просмотреть файл

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -22,7 +22,7 @@
/* /*
* Source file for all CyaSSL-specific code for the TLS/SSL layer. No code * Source file for all CyaSSL-specific code for the TLS/SSL layer. No code
* but sslgen.c should ever call or use these functions. * but curl_sslgen.c should ever call or use these functions.
* *
*/ */

4
lib/easy.c
Просмотреть файл

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -62,7 +62,7 @@
#include "curl_slist.h" #include "curl_slist.h"
#include "curl_amigaos.h" #include "curl_amigaos.h"
#include "curl_rand.h" #include "curl_rand.h"
#include "curl_non-ascii.h" #include "curl_non_ascii.h"
#include "curl_warnless.h" #include "curl_warnless.h"
#include "curl_conncache.h" #include "curl_conncache.h"

4
lib/escape.c
Просмотреть файл

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -30,7 +30,7 @@
#include "curl_memory.h" #include "curl_memory.h"
#include "curl_urldata.h" #include "curl_urldata.h"
#include "curl_warnless.h" #include "curl_warnless.h"
#include "curl_non-ascii.h" #include "curl_non_ascii.h"
#include "curl_escape.h" #include "curl_escape.h"
#define _MPRINTF_REPLACE /* use our functions only */ #define _MPRINTF_REPLACE /* use our functions only */

6
lib/formdata.c
Просмотреть файл

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -857,8 +857,8 @@ static CURLcode AddFormDataf(struct FormData **formp,
} }
/* /*
* Curl_formclean() is used from http.c, this cleans a built FormData linked * Curl_formclean() is used from curl_http.c, this cleans a built FormData
* list * linked list
*/ */
void Curl_formclean(struct FormData **form_ptr) void Curl_formclean(struct FormData **form_ptr)
{ {

8
lib/ftp.c
Просмотреть файл

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -80,7 +80,7 @@
#include "curl_speedcheck.h" #include "curl_speedcheck.h"
#include "curl_warnless.h" #include "curl_warnless.h"
#include "curl_http_proxy.h" #include "curl_http_proxy.h"
#include "curl_non-ascii.h" #include "curl_non_ascii.h"
#define _MPRINTF_REPLACE /* use our functions only */ #define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h> #include <curl/mprintf.h>
@ -3109,7 +3109,7 @@ static CURLcode ftp_statemach_act(struct connectdata *conn)
} }
/* called repeatedly until done from multi.c */ /* called repeatedly until done from curl_multi.c */
static CURLcode ftp_multi_statemach(struct connectdata *conn, static CURLcode ftp_multi_statemach(struct connectdata *conn,
bool *done) bool *done)
{ {
@ -4461,7 +4461,7 @@ static CURLcode ftp_dophase_done(struct connectdata *conn,
return CURLE_OK; return CURLE_OK;
} }
/* called from multi.c while DOing */ /* called from curl_multi.c while DOing */
static CURLcode ftp_doing(struct connectdata *conn, static CURLcode ftp_doing(struct connectdata *conn,
bool *dophase_done) bool *dophase_done)
{ {

4
lib/gtls.c
Просмотреть файл

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -22,7 +22,7 @@
/* /*
* Source file for all GnuTLS-specific code for the TLS/SSL layer. No code * Source file for all GnuTLS-specific code for the TLS/SSL layer. No code
* but sslgen.c should ever call or use these functions. * but curl_sslgen.c should ever call or use these functions.
* *
* Note: don't use the GnuTLS' *_t variable type names in this source code, * Note: don't use the GnuTLS' *_t variable type names in this source code,
* since they were not present in 1.0.X. * since they were not present in 1.0.X.

24
lib/hostip.c
Просмотреть файл

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -71,10 +71,10 @@
#endif #endif
/* /*
* hostip.c explained * curl_hostip.c explained
* ================== * =======================
* *
* The main COMPILE-TIME DEFINES to keep in mind when reading the host*.c * The main COMPILE-TIME DEFINES to keep in mind when reading the curl_host*.c
* source file are these: * source file are these:
* *
* CURLRES_IPV6 - this host has getaddrinfo() and family, and thus we use * CURLRES_IPV6 - this host has getaddrinfo() and family, and thus we use
@ -93,17 +93,17 @@
* libcurl is not built to use an asynchronous resolver, CURLRES_SYNCH is * libcurl is not built to use an asynchronous resolver, CURLRES_SYNCH is
* defined. * defined.
* *
* The host*.c sources files are split up like this: * The curl_host*.c sources files are split up like this:
* *
* hostip.c - method-independent resolver functions and utility functions * curl_hostip.c - method-independent resolver and utility functions
* hostasyn.c - functions for asynchronous name resolves * curl_hostasyn.c - functions for asynchronous name resolves
* hostsyn.c - functions for synchronous name resolves * curl_hostsyn.c - functions for synchronous name resolves
* hostip4.c - ipv4-specific functions * curl_hostip4.c - ipv4-specific functions
* hostip6.c - ipv6-specific functions * curl_hostip6.c - ipv6-specific functions
* *
* The two asynchronous name resolver backends are implemented in: * The two asynchronous name resolver backends are implemented in:
* asyn-ares.c - functions for ares-using name resolves * curl_asyn_ares.c - functions for ares-using name resolves
* asyn-thread.c - functions for threaded name resolves * curl_asyn_thread.c - functions for threaded name resolves
* The curl_hostip.h is the united header file for all this. It defines the * The curl_hostip.h is the united header file for all this. It defines the
* CURLRES_* defines based on the config*.h and curl_setup.h defines. * CURLRES_* defines based on the config*.h and curl_setup.h defines.

6
lib/hostip6.c
Просмотреть файл

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -65,8 +65,8 @@
#if defined(CURLDEBUG) && defined(HAVE_GETNAMEINFO) #if defined(CURLDEBUG) && defined(HAVE_GETNAMEINFO)
/* These are strictly for memory tracing and are using the same style as the /* These are strictly for memory tracing and are using the same style as the
* family otherwise present in memdebug.c. I put these ones here since they * family otherwise present in curl_memdebug.c. I put these ones here since
* require a bunch of structs I didn't want to include in memdebug.c * they require a bunch of structs I didn't want to include there.
*/ */
/* /*

20
lib/http.c
Просмотреть файл

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -72,7 +72,7 @@
#include "curl_content_encoding.h" #include "curl_content_encoding.h"
#include "curl_http_proxy.h" #include "curl_http_proxy.h"
#include "curl_warnless.h" #include "curl_warnless.h"
#include "curl_non-ascii.h" #include "curl_non_ascii.h"
#define _MPRINTF_REPLACE /* use our functions only */ #define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h> #include <curl/mprintf.h>
@ -679,8 +679,8 @@ Curl_http_output_auth(struct connectdata *conn,
/* /*
* Curl_http_input_auth() deals with Proxy-Authenticate: and WWW-Authenticate: * Curl_http_input_auth() deals with Proxy-Authenticate: and WWW-Authenticate:
* headers. They are dealt with both in the transfer.c main loop and in the * headers. They are dealt with both in the curl_transfer.c main loop and in
* proxy CONNECT loop. * the proxy CONNECT loop.
*/ */
CURLcode Curl_http_input_auth(struct connectdata *conn, CURLcode Curl_http_input_auth(struct connectdata *conn,
@ -936,7 +936,7 @@ static int http_should_fail(struct connectdata *conn)
* readmoredata() is a "fread() emulation" to provide POST and/or request * readmoredata() is a "fread() emulation" to provide POST and/or request
* data. It is used when a huge POST is to be made and the entire chunk wasn't * data. It is used when a huge POST is to be made and the entire chunk wasn't
* sent in the first send(). This function will then be called from the * sent in the first send(). This function will then be called from the
* transfer.c loop when more data is to be sent to the peer. * curl_transfer.c loop when more data is to be sent to the peer.
* *
* Returns the amount of bytes it filled the buffer with. * Returns the amount of bytes it filled the buffer with.
*/ */
@ -1536,7 +1536,7 @@ CURLcode Curl_add_custom_headers(struct connectdata *conn,
checkprefix("Host:", headers->data)) checkprefix("Host:", headers->data))
; ;
else if(conn->data->set.httpreq == HTTPREQ_POST_FORM && else if(conn->data->set.httpreq == HTTPREQ_POST_FORM &&
/* this header (extended by formdata.c) is sent later */ /* this header (extended by curl_formdata.c) is sent later */
checkprefix("Content-Type:", headers->data)) checkprefix("Content-Type:", headers->data))
; ;
else if(conn->bits.authneg && else if(conn->bits.authneg &&
@ -1728,10 +1728,10 @@ CURLcode Curl_http(struct connectdata *conn, bool *done)
} }
} }
/* The User-Agent string might have been allocated in url.c already, because /* The User-Agent string might have been allocated in curl_url.c already,
it might have been used in the proxy connect, but if we have got a header because it might have been used in the proxy connect, but if we have
with the user-agent string specified, we erase the previously made string got a header with the user-agent string specified, we erase the
here. */ previously made string here. */
if(Curl_checkheaders(data, "User-Agent:") && conn->allocptr.uagent) { if(Curl_checkheaders(data, "User-Agent:") && conn->allocptr.uagent) {
free(conn->allocptr.uagent); free(conn->allocptr.uagent);
conn->allocptr.uagent=NULL; conn->allocptr.uagent=NULL;

6
lib/http_chunks.c
Просмотреть файл

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -30,7 +30,7 @@
#include "curl_content_encoding.h" #include "curl_content_encoding.h"
#include "curl_http.h" #include "curl_http.h"
#include "curl_memory.h" #include "curl_memory.h"
#include "curl_non-ascii.h" /* for Curl_convert_to_network prototype */ #include "curl_non_ascii.h" /* for Curl_convert_to_network prototype */
#define _MPRINTF_REPLACE /* use our functions only */ #define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h> #include <curl/mprintf.h>
@ -315,7 +315,7 @@ CHUNKcode Curl_httpchunk_read(struct connectdata *conn,
} }
} }
else { else {
/* conn->trailer is assumed to be freed in url.c on a /* conn->trailer is assumed to be freed in curl_url.c on a
connection basis */ connection basis */
if(conn->trlPos >= conn->trlMax) { if(conn->trlPos >= conn->trlMax) {
/* we always allocate three extra bytes, just because when the full /* we always allocate three extra bytes, just because when the full

4
lib/http_digest.c
Просмотреть файл

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -33,7 +33,7 @@
#include "curl_strtok.h" #include "curl_strtok.h"
#include "curl_url.h" #include "curl_url.h"
#include "curl_memory.h" #include "curl_memory.h"
#include "curl_non-ascii.h" /* included for Curl_convert_... prototypes */ #include "curl_non_ascii.h" /* included for Curl_convert_... prototypes */
#include "curl_warnless.h" #include "curl_warnless.h"
#define _MPRINTF_REPLACE /* use our functions only */ #define _MPRINTF_REPLACE /* use our functions only */

4
lib/http_proxy.c
Просмотреть файл

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -33,7 +33,7 @@
#include "curl_select.h" #include "curl_select.h"
#include "curl_rawstr.h" #include "curl_rawstr.h"
#include "curl_progress.h" #include "curl_progress.h"
#include "curl_non-ascii.h" #include "curl_non_ascii.h"
#include "curl_connect.h" #include "curl_connect.h"
#define _MPRINTF_REPLACE /* use our functions only */ #define _MPRINTF_REPLACE /* use our functions only */

6
lib/imap.c
Просмотреть файл

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -718,7 +718,7 @@ static CURLcode imap_statemach_act(struct connectdata *conn)
return result; return result;
} }
/* Called repeatedly until done from multi.c */ /* Called repeatedly until done from curl_multi.c */
static CURLcode imap_multi_statemach(struct connectdata *conn, static CURLcode imap_multi_statemach(struct connectdata *conn,
bool *done) bool *done)
{ {
@ -1045,7 +1045,7 @@ static CURLcode imap_dophase_done(struct connectdata *conn, bool connected)
return CURLE_OK; return CURLE_OK;
} }
/* Called from multi.c while DOing */ /* Called from curl_multi.c while DOing */
static CURLcode imap_doing(struct connectdata *conn, bool *dophase_done) static CURLcode imap_doing(struct connectdata *conn, bool *dophase_done)
{ {
CURLcode result = imap_multi_statemach(conn, dophase_done); CURLcode result = imap_multi_statemach(conn, dophase_done);

4
lib/krb5.c
Просмотреть файл

@ -1,8 +1,8 @@
/* GSSAPI/krb5 support for FTP - loosely based on old krb4.c /* GSSAPI/krb5 support for FTP - loosely based on old curl_krb4.c
* *
* Copyright (c) 1995, 1996, 1997, 1998, 1999 Kungliga Tekniska Högskolan * Copyright (c) 1995, 1996, 1997, 1998, 1999 Kungliga Tekniska Högskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* Copyright (c) 2004 - 2012 Daniel Stenberg * Copyright (c) 2004 - 2013 Daniel Stenberg
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without

16
lib/ldap.c
Просмотреть файл

@ -1,11 +1,11 @@
/*************************************************************************** /***************************************************************************
* _ _ ____ _ * _ _ ____ _
* Project ___| | | | _ \| | * Project ___| | | | _ \| |
* / __| | | | |_) | | * / __| | | | |_) | |
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -27,8 +27,8 @@
/* /*
* Notice that USE_OPENLDAP is only a source code selection switch. When * Notice that USE_OPENLDAP is only a source code selection switch. When
* libcurl is built with USE_OPENLDAP defined the libcurl source code that * libcurl is built with USE_OPENLDAP defined the libcurl source code that
* gets compiled is the code from openldap.c, otherwise the code that gets * gets compiled is the code from curl_openldap.c, otherwise the code that
* compiled is the code from ldap.c. * gets compiled is the code from curl_ldap.c.
* *
* When USE_OPENLDAP is defined a recent version of the OpenLDAP library * When USE_OPENLDAP is defined a recent version of the OpenLDAP library
* might be required for compilation and runtime. In order to use ancient * might be required for compilation and runtime. In order to use ancient

4
lib/mprintf.c
Просмотреть файл

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1999 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1999 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -73,7 +73,7 @@
#endif #endif
/* /*
* Max integer data types that mprintf.c is capable * Max integer data types that curl_mprintf.c is capable
*/ */
#ifdef HAVE_LONG_LONG_TYPE #ifdef HAVE_LONG_LONG_TYPE

4
lib/multi.c
Просмотреть файл

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -598,7 +598,7 @@ CURLMcode curl_multi_add_handle(CURLM *multi_handle,
* *
* Curl_hash_print(multi->sockhash, debug_print_sock_hash); * Curl_hash_print(multi->sockhash, debug_print_sock_hash);
* *
* Enable the hash print function first by editing hash.c * Enable the hash print function first by editing curl_hash.c
*/ */
static void debug_print_sock_hash(void *p) static void debug_print_sock_hash(void *p)
{ {

8
lib/non-ascii.c
Просмотреть файл

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -26,7 +26,7 @@
#include <curl/curl.h> #include <curl/curl.h>
#include "curl_non-ascii.h" #include "curl_non_ascii.h"
#include "curl_formdata.h" #include "curl_formdata.h"
#include "curl_sendf.h" #include "curl_sendf.h"
#include "curl_urldata.h" #include "curl_urldata.h"
@ -314,8 +314,8 @@ void Curl_convert_close(struct SessionHandle *data)
} }
/* /*
* Curl_convert_form() is used from http.c, this converts any form items that * Curl_convert_form() is used from curl_http.c, this converts any form items
need to be sent in the network encoding. Returns CURLE_OK on success. * that need to be sent in the network encoding. Returns CURLE_OK on success.
*/ */
CURLcode Curl_convert_form(struct SessionHandle *data, struct FormData *form) CURLcode Curl_convert_form(struct SessionHandle *data, struct FormData *form)
{ {

4
lib/nss.c
Просмотреть файл

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -22,7 +22,7 @@
/* /*
* Source file for all NSS-specific code for the TLS/SSL layer. No code * Source file for all NSS-specific code for the TLS/SSL layer. No code
* but sslgen.c should ever call or use these functions. * but curl_sslgen.c should ever call or use these functions.
*/ */
#include "curl_setup.h" #include "curl_setup.h"

16
lib/openldap.c
Просмотреть файл

@ -1,12 +1,12 @@
/*************************************************************************** /***************************************************************************
* _ _ ____ _ * _ _ ____ _
* Project ___| | | | _ \| | * Project ___| | | | _ \| |
* / __| | | | |_) | | * / __| | | | |_) | |
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 2010, Howard Chu, <hyc@openldap.org> * Copyright (C) 2010, Howard Chu, <hyc@openldap.org>
* Copyright (C) 2011 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 2011 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -28,8 +28,8 @@
/* /*
* Notice that USE_OPENLDAP is only a source code selection switch. When * Notice that USE_OPENLDAP is only a source code selection switch. When
* libcurl is built with USE_OPENLDAP defined the libcurl source code that * libcurl is built with USE_OPENLDAP defined the libcurl source code that
* gets compiled is the code from openldap.c, otherwise the code that gets * gets compiled is the code from curl_openldap.c, otherwise the code that
* compiled is the code from ldap.c. * gets compiled is the code from curl_ldap.c.
* *
* When USE_OPENLDAP is defined a recent version of the OpenLDAP library * When USE_OPENLDAP is defined a recent version of the OpenLDAP library
* might be required for compilation and runtime. In order to use ancient * might be required for compilation and runtime. In order to use ancient

4
lib/pingpong.c
Просмотреть файл

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -32,7 +32,7 @@
#include "curl_speedcheck.h" #include "curl_speedcheck.h"
#include "curl_pingpong.h" #include "curl_pingpong.h"
#include "curl_multiif.h" #include "curl_multiif.h"
#include "curl_non-ascii.h" #include "curl_non_ascii.h"
#define _MPRINTF_REPLACE /* use our functions only */ #define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h> #include <curl/mprintf.h>

4
lib/polarssl.c
Просмотреть файл

@ -6,7 +6,7 @@
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 2010, 2011, Hoi-Ho Chan, <hoiho.chan@gmail.com> * Copyright (C) 2010, 2011, Hoi-Ho Chan, <hoiho.chan@gmail.com>
* Copyright (C) 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 2012 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -23,7 +23,7 @@
/* /*
* Source file for all PolarSSL-specific code for the TLS/SSL layer. No code * Source file for all PolarSSL-specific code for the TLS/SSL layer. No code
* but sslgen.c should ever call or use these functions. * but curl_sslgen.c should ever call or use these functions.
* *
*/ */

6
lib/pop3.c
Просмотреть файл

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -1207,7 +1207,7 @@ static CURLcode pop3_statemach_act(struct connectdata *conn)
return result; return result;
} }
/* Called repeatedly until done from multi.c */ /* Called repeatedly until done from curl_multi.c */
static CURLcode pop3_multi_statemach(struct connectdata *conn, bool *done) static CURLcode pop3_multi_statemach(struct connectdata *conn, bool *done)
{ {
struct pop3_conn *pop3c = &conn->proto.pop3c; struct pop3_conn *pop3c = &conn->proto.pop3c;
@ -1547,7 +1547,7 @@ static CURLcode pop3_dophase_done(struct connectdata *conn, bool connected)
return CURLE_OK; return CURLE_OK;
} }
/* Called from multi.c while DOing */ /* Called from curl_multi.c while DOing */
static CURLcode pop3_doing(struct connectdata *conn, bool *dophase_done) static CURLcode pop3_doing(struct connectdata *conn, bool *dophase_done)
{ {
CURLcode result = pop3_multi_statemach(conn, dophase_done); CURLcode result = pop3_multi_statemach(conn, dophase_done);

10
lib/rtsp.c
Просмотреть файл

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -381,10 +381,10 @@ static CURLcode rtsp_do(struct connectdata *conn, bool *done)
} }
} }
/* The User-Agent string might have been allocated in url.c already, because /* The User-Agent string might have been allocated in curl_url.c already,
it might have been used in the proxy connect, but if we have got a header because it might have been used in the proxy connect, but if we have
with the user-agent string specified, we erase the previously made string got a header with the user-agent string specified, we erase the
here. */ previously made string here. */
if(Curl_checkheaders(data, "User-Agent:") && conn->allocptr.uagent) { if(Curl_checkheaders(data, "User-Agent:") && conn->allocptr.uagent) {
Curl_safefree(conn->allocptr.uagent); Curl_safefree(conn->allocptr.uagent);
conn->allocptr.uagent = NULL; conn->allocptr.uagent = NULL;

4
lib/sendf.c
Просмотреть файл

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -30,7 +30,7 @@
#include "curl_sslgen.h" #include "curl_sslgen.h"
#include "curl_ssh.h" #include "curl_ssh.h"
#include "curl_multiif.h" #include "curl_multiif.h"
#include "curl_non-ascii.h" #include "curl_non_ascii.h"
#define _MPRINTF_REPLACE /* use the internal *printf() functions */ #define _MPRINTF_REPLACE /* use the internal *printf() functions */
#include <curl/mprintf.h> #include <curl/mprintf.h>

6
lib/smtp.c
Просмотреть файл

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -1226,7 +1226,7 @@ static CURLcode smtp_statemach_act(struct connectdata *conn)
return result; return result;
} }
/* Called repeatedly until done from multi.c */ /* Called repeatedly until done from curl_multi.c */
static CURLcode smtp_multi_statemach(struct connectdata *conn, bool *done) static CURLcode smtp_multi_statemach(struct connectdata *conn, bool *done)
{ {
struct smtp_conn *smtpc = &conn->proto.smtpc; struct smtp_conn *smtpc = &conn->proto.smtpc;
@ -1584,7 +1584,7 @@ static CURLcode smtp_dophase_done(struct connectdata *conn, bool connected)
return CURLE_OK; return CURLE_OK;
} }
/* Called from multi.c while DOing */ /* Called from curl_multi.c while DOing */
static CURLcode smtp_doing(struct connectdata *conn, bool *dophase_done) static CURLcode smtp_doing(struct connectdata *conn, bool *dophase_done)
{ {
CURLcode result = smtp_multi_statemach(conn, dophase_done); CURLcode result = smtp_multi_statemach(conn, dophase_done);

10
lib/ssh.c
Просмотреть файл

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -2620,7 +2620,7 @@ static void ssh_block2waitfor(struct connectdata *conn, bool block)
#define ssh_block2waitfor(x,y) Curl_nop_stmt #define ssh_block2waitfor(x,y) Curl_nop_stmt
#endif #endif
/* called repeatedly until done from multi.c */ /* called repeatedly until done from curl_multi.c */
static CURLcode ssh_multi_statemach(struct connectdata *conn, bool *done) static CURLcode ssh_multi_statemach(struct connectdata *conn, bool *done)
{ {
struct ssh_conn *sshc = &conn->proto.sshc; struct ssh_conn *sshc = &conn->proto.sshc;
@ -2844,7 +2844,7 @@ CURLcode scp_perform(struct connectdata *conn,
return result; return result;
} }
/* called from multi.c while DOing */ /* called from curl_multi.c while DOing */
static CURLcode scp_doing(struct connectdata *conn, static CURLcode scp_doing(struct connectdata *conn,
bool *dophase_done) bool *dophase_done)
{ {
@ -3053,7 +3053,7 @@ CURLcode sftp_perform(struct connectdata *conn,
return result; return result;
} }
/* called from multi.c while DOing */ /* called from curl_multi.c while DOing */
static CURLcode sftp_doing(struct connectdata *conn, static CURLcode sftp_doing(struct connectdata *conn,
bool *dophase_done) bool *dophase_done)
{ {
@ -3154,7 +3154,7 @@ static ssize_t sftp_recv(struct connectdata *conn, int sockindex,
return nread; return nread;
} }
/* The get_pathname() function is being borrowed from OpenSSH sftp.c /* The get_pathname() function is being borrowed from OpenSSH-sftp.c
version 4.6p1. */ version 4.6p1. */
/* /*
* Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>

6
lib/ssluse.c
Просмотреть файл

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -22,7 +22,7 @@
/* /*
* Source file for all OpenSSL-specific code for the TLS/SSL layer. No code * Source file for all OpenSSL-specific code for the TLS/SSL layer. No code
* but sslgen.c should ever call or use these functions. * but curl_sslgen.c should ever call or use these functions.
*/ */
/* /*
@ -69,7 +69,7 @@
#include "curl_warnless.h" #include "curl_warnless.h"
#include "curl_memory.h" #include "curl_memory.h"
#include "curl_non-ascii.h" /* for Curl_convert_from_utf8 prototype */ #include "curl_non_ascii.h" /* for Curl_convert_from_utf8 prototype */
/* The last #include file should be: */ /* The last #include file should be: */
#include "curl_memdebug.h" #include "curl_memdebug.h"

4
lib/tftp.c
Просмотреть файл

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -1371,7 +1371,7 @@ static CURLcode tftp_multi_statemach(struct connectdata *conn, bool *done)
* *
* tftp_doing * tftp_doing
* *
* Called from multi.c while DOing * Called from curl_multi.c while DOing
* *
**********************************************************/ **********************************************************/
static CURLcode tftp_doing(struct connectdata *conn, bool *dophase_done) static CURLcode tftp_doing(struct connectdata *conn, bool *dophase_done)

6
lib/transfer.c
Просмотреть файл

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -79,7 +79,7 @@
#include "curl_select.h" #include "curl_select.h"
#include "curl_multiif.h" #include "curl_multiif.h"
#include "curl_connect.h" #include "curl_connect.h"
#include "curl_non-ascii.h" #include "curl_non_ascii.h"
#define _MPRINTF_REPLACE /* use our functions only */ #define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h> #include <curl/mprintf.h>
@ -683,7 +683,7 @@ static CURLcode readwrite_data(struct SessionHandle *data,
if(k->badheader < HEADER_ALLBAD) { if(k->badheader < HEADER_ALLBAD) {
/* This switch handles various content encodings. If there's an /* This switch handles various content encodings. If there's an
error here, be sure to check over the almost identical code error here, be sure to check over the almost identical code
in http_chunks.c. in curl_http_chunks.c.
Make sure that ALL_CONTENT_ENCODINGS contains all the Make sure that ALL_CONTENT_ENCODINGS contains all the
encodings handled here. */ encodings handled here. */
#ifdef HAVE_LIBZ #ifdef HAVE_LIBZ

10
lib/url.c
Просмотреть файл

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -98,7 +98,7 @@ int curl_win32_idn_to_ascii(const char *in, char **out);
#include "curl_speedcheck.h" #include "curl_speedcheck.h"
#include "curl_rawstr.h" #include "curl_rawstr.h"
#include "curl_warnless.h" #include "curl_warnless.h"
#include "curl_non-ascii.h" #include "curl_non_ascii.h"
#include "curl_inet_pton.h" #include "curl_inet_pton.h"
/* And now for the protocols */ /* And now for the protocols */
@ -2190,7 +2190,7 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option,
break; break;
case CURLOPT_SSH_KEYFUNCTION: case CURLOPT_SSH_KEYFUNCTION:
/* setting to NULL is fine since the ssh.c functions themselves will /* setting to NULL is fine since the curl_ssh.c functions themselves will
then rever to use the internal default */ then rever to use the internal default */
data->set.ssh_keyfunc = va_arg(param, curl_sshkeycallback); data->set.ssh_keyfunc = va_arg(param, curl_sshkeycallback);
break; break;
@ -3688,7 +3688,7 @@ static CURLcode parseurlandfillconn(struct SessionHandle *data,
*/ */
/* Note: if you add a new protocol, please update the list in /* Note: if you add a new protocol, please update the list in
* lib/version.c too! */ * lib/curl_version.c too! */
if(checkprefix("FTP.", conn->host.name)) if(checkprefix("FTP.", conn->host.name))
protop = "ftp"; protop = "ftp";
@ -5356,7 +5356,7 @@ CURLcode Curl_do(struct connectdata **connp, bool *done)
/* generic protocol-specific function pointer set in curl_connect() */ /* generic protocol-specific function pointer set in curl_connect() */
result = conn->handler->do_it(conn, done); result = conn->handler->do_it(conn, done);
/* This was formerly done in transfer.c, but we better do it here */ /* This was formerly done in curl_transfer.c, but we better do it here */
if((CURLE_SEND_ERROR == result) && conn->bits.reuse) { if((CURLE_SEND_ERROR == result) && conn->bits.reuse) {
/* /*
* If the connection is using an easy handle, call reconnect * If the connection is using an easy handle, call reconnect

14
packages/OS400/make-lib.sh
Просмотреть файл

@ -13,7 +13,7 @@ cd "${TOPDIR}/lib"
echo '#pragma comment(user, "libcurl version '"${LIBCURL_VERSION}"'")' > os400.c echo '#pragma comment(user, "libcurl version '"${LIBCURL_VERSION}"'")' > os400.c
echo '#pragma comment(user, __DATE__)' >> os400.c echo '#pragma comment(user, __DATE__)' >> os400.c
echo '#pragma comment(user, __TIME__)' >> os400.c echo '#pragma comment(user, __TIME__)' >> os400.c
echo '#pragma comment(copyright, "Copyright (C) 1998-2012 Daniel Stenberg et al. OS/400 version by P. Monnerat")' >> os400.c echo '#pragma comment(copyright, "Copyright (C) 1998-2013 Daniel Stenberg et al. OS/400 version by P. Monnerat")' >> os400.c
make_module OS400 os400.c make_module OS400 os400.c
LINK= # No need to rebuild service program yet. LINK= # No need to rebuild service program yet.
MODULES= MODULES=
@ -151,13 +151,13 @@ fi
if [ "${TEST_FORMDATA}" ] if [ "${TEST_FORMDATA}" ]
then MODULES= then MODULES=
make_module TFORMDATA formdata.c "'_FORM_DEBUG' 'CURLDEBUG'" make_module TFORMDATA curl_formdata.c "'_FORM_DEBUG' 'CURLDEBUG'"
make_module TSTREQUAL strequal.c "'_FORM_DEBUG' 'CURLDEBUG'" make_module TSTREQUAL curl_strequal.c "'_FORM_DEBUG' 'CURLDEBUG'"
make_module TMEMDEBUG memdebug.c "'_FORM_DEBUG' 'CURLDEBUG'" make_module TMEMDEBUG curl_memdebug.c "'_FORM_DEBUG' 'CURLDEBUG'"
make_module TMPRINTF mprintf.c "'_FORM_DEBUG' 'CURLDEBUG'" make_module TMPRINTF curl_mprintf.c "'_FORM_DEBUG' 'CURLDEBUG'"
make_module TSTRERROR strerror.c "'_FORM_DEBUG' 'CURLDEBUG'" make_module TSTRERROR curl_strerror.c "'_FORM_DEBUG' 'CURLDEBUG'"
# The following modules should not be needed (see comment in # The following modules should not be needed (see comment in
# formdata.c. However, there are some unsatisfied # curl_formdata.c. However, there are some unsatisfied
# external references leading in the following # external references leading in the following
# modules to be (recursively) needed. # modules to be (recursively) needed.
MODULES="${MODULES} EASY STRDUP SSLGEN QSSL HOSTIP HOSTIP4 HOSTIP6" MODULES="${MODULES} EASY STRDUP SSLGEN QSSL HOSTIP HOSTIP4 HOSTIP6"

3
packages/Symbian/group/curl.mmp
Просмотреть файл

@ -49,7 +49,8 @@ SOURCE \
SOURCEPATH ../../../lib SOURCEPATH ../../../lib
SOURCE \ SOURCE \
rawstr.c nonblock.c curl_nonblock.c \
curl_rawstr.c
USERINCLUDE ../../../src ../../../lib ../../../include/curl USERINCLUDE ../../../src ../../../lib ../../../include/curl

125
packages/Symbian/group/libcurl.mmp
Просмотреть файл

@ -21,24 +21,113 @@ MACRO USE_SSLEAY
SOURCEPATH ../../../lib SOURCEPATH ../../../lib
SOURCE \ SOURCE \
file.c timeval.c base64.c hostip.c progress.c formdata.c \ curl_addrinfo.c \
cookie.c http.c sendf.c ftp.c url.c dict.c if2ip.c speedcheck.c \ curl_amigaos.c \
ldap.c ssluse.c version.c getenv.c escape.c mprintf.c telnet.c \ curl_asyn_ares.c \
netrc.c getinfo.c transfer.c strequal.c easy.c security.c krb4.c \ curl_asyn_thread.c \
curl_fnmatch.c fileinfo.c ftplistparser.c wildcard.c krb5.c \ curl_axtls.c \
memdebug.c http_chunks.c strtok.c connect.c llist.c hash.c multi.c \ curl_base64.c \
content_encoding.c share.c http_digest.c md4.c md5.c curl_rand.c \ curl_bundles.c \
http_negotiate.c inet_pton.c strtoofft.c strerror.c amigaos.c \ curl_conncache.c \
hostasyn.c hostip4.c hostip6.c hostsyn.c inet_ntop.c parsedate.c \ curl_connect.c \
select.c gtls.c sslgen.c tftp.c splay.c strdup.c socks.c ssh.c nss.c \ curl_content_encoding.c \
qssl.c rawstr.c curl_addrinfo.c socks_gssapi.c socks_sspi.c \ curl_cookie.c \
curl_sspi.c slist.c nonblock.c curl_memrchr.c imap.c pop3.c smtp.c \ curl_cyassl.c \
pingpong.c rtsp.c curl_threads.c warnless.c hmac.c polarssl.c \ curl_darwinssl.c \
curl_rtmp.c openldap.c curl_gethostname.c gopher.c axtls.c \ curl_dict.c \
idn_win32.c http_negotiate_sspi.c cyassl.c http_proxy.c non-ascii.c \ curl_easy.c \
asyn-ares.c asyn-thread.c curl_gssapi.c curl_ntlm.c curl_ntlm_wb.c \ curl_escape.c \
curl_ntlm_core.c curl_ntlm_msgs.c curl_sasl.c curl_schannel.c \ curl_file.c \
curl_multibyte.c curl_darwinssl.c bundles.c conncache.c curl_fileinfo.c \
curl_fnmatch.c \
curl_formdata.c \
curl_ftp.c \
curl_ftplistparser.c \
curl_getenv.c \
curl_gethostname.c \
curl_getinfo.c \
curl_gopher.c \
curl_gssapi.c \
curl_gtls.c \
curl_hash.c \
curl_hmac.c \
curl_hostasyn.c \
curl_hostip.c \
curl_hostip4.c \
curl_hostip6.c \
curl_hostsyn.c \
curl_http.c \
curl_http_chunks.c \
curl_http_digest.c \
curl_http_negotiate.c \
curl_http_negotiate_sspi.c \
curl_http_proxy.c \
curl_idn_win32.c \
curl_if2ip.c \
curl_imap.c \
curl_inet_ntop.c \
curl_inet_pton.c \
curl_krb4.c \
curl_krb5.c \
curl_ldap.c \
curl_llist.c \
curl_md4.c \
curl_md5.c \
curl_memdebug.c \
curl_memrchr.c \
curl_mprintf.c \
curl_multi.c \
curl_multibyte.c \
curl_netrc.c \
curl_non_ascii.c \
curl_nonblock.c \
curl_nss.c \
curl_ntlm.c \
curl_ntlm_core.c \
curl_ntlm_msgs.c \
curl_ntlm_wb.c \
curl_openldap.c \
curl_parsedate.c \
curl_pingpong.c \
curl_polarssl.c \
curl_pop3.c \
curl_progress.c \
curl_qssl.c \
curl_rand.c \
curl_rawstr.c \
curl_rtmp.c \
curl_rtsp.c \
curl_sasl.c \
curl_schannel.c \
curl_security.c \
curl_select.c \
curl_sendf.c \
curl_share.c \
curl_slist.c \
curl_smtp.c \
curl_socks.c \
curl_socks_gssapi.c \
curl_socks_sspi.c \
curl_speedcheck.c \
curl_splay.c \
curl_ssh.c \
curl_sslgen.c \
curl_ssluse.c \
curl_sspi.c \
curl_strdup.c \
curl_strequal.c \
curl_strerror.c \
curl_strtok.c \
curl_strtoofft.c \
curl_telnet.c \
curl_tftp.c \
curl_threads.c \
curl_timeval.c \
curl_transfer.c \
curl_url.c \
curl_version.c \
curl_warnless.c \
curl_wildcard.c
USERINCLUDE ../../../lib ../../../include/curl USERINCLUDE ../../../lib ../../../include/curl
#ifdef ENABLE_SSL #ifdef ENABLE_SSL

2
src/Makefile.Watcom
Просмотреть файл

@ -114,7 +114,7 @@ LINK_ARG = $(OBJ_DIR)$(DS)wlink.arg
!endif !endif
# For now we still define the CURLX_ONES sources here unless we know how # For now we still define the CURLX_ONES sources here unless we know how
# to split off the prefixed path. # to split off the prefixed path.
CURLX_SOURCES = rawstr.c nonblock.c CURLX_SOURCES = curl_rawstr.c curl_nonblock.c
OBJS = $(CURL_CFILES:.c=.obj) OBJS = $(CURL_CFILES:.c=.obj)
!ifdef %curl_static !ifdef %curl_static

9
src/Makefile.inc
Просмотреть файл

@ -9,10 +9,11 @@
# libcurl has sources that provide functions named curlx_* that aren't part of # 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. # the official API, but we re-use the code here to avoid duplication.
CURLX_ONES = $(top_srcdir)/lib/strtoofft.c \ CURLX_ONES = \
$(top_srcdir)/lib/strdup.c \ $(top_srcdir)/lib/curl_nonblock.c \
$(top_srcdir)/lib/rawstr.c \ $(top_srcdir)/lib/curl_rawstr.c \
$(top_srcdir)/lib/nonblock.c $(top_srcdir)/lib/curl_strdup.c \
$(top_srcdir)/lib/curl_strtoofft.c
CURL_CFILES = \ CURL_CFILES = \
tool_binmode.c \ tool_binmode.c \

38
src/Makefile.vc6
Просмотреть файл

@ -5,7 +5,7 @@
# | (__| |_| | _ <| |___ # | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____| # \___|\___/|_| \_\_____|
# #
# Copyright (C) 1999 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. # Copyright (C) 1999 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
# #
# This software is licensed as described in the file COPYING, which # This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms # you should have received as part of this distribution. The terms
@ -134,9 +134,9 @@ CFLAGS = $(CFLAGS) /DUSE_WINDOWS_SSPI /I$(WINDOWS_SDK_PATH)\include
!ENDIF !ENDIF
RELEASE_OBJS= \ RELEASE_OBJS= \
nonblockr.obj \ curl_nonblockr.obj \
rawstrr.obj \ curl_rawstrr.obj \
strtoofftr.obj \ curl_strtoofftr.obj \
tool_binmoder.obj \ tool_binmoder.obj \
tool_bnamer.obj \ tool_bnamer.obj \
tool_cb_dbgr.obj \ tool_cb_dbgr.obj \
@ -178,9 +178,9 @@ RELEASE_OBJS= \
curlr.res curlr.res
DEBUG_OBJS= \ DEBUG_OBJS= \
nonblockd.obj \ curl_nonblockd.obj \
rawstrd.obj \ curl_rawstrd.obj \
strtoofftd.obj \ curl_strtoofftd.obj \
tool_binmoded.obj \ tool_binmoded.obj \
tool_bnamed.obj \ tool_bnamed.obj \
tool_cb_dbgd.obj \ tool_cb_dbgd.obj \
@ -341,12 +341,12 @@ debug: $(DEBUG_OBJS)
$(MANIFESTTOOL) $(MANIFESTTOOL)
## Release ## Release
nonblockr.obj: ../lib/nonblock.c curl_nonblockr.obj: ../lib/curl_nonblock.c
$(CCR) $(CFLAGS) /Fo"$@" ../lib/nonblock.c $(CCR) $(CFLAGS) /Fo"$@" ../lib/curl_nonblock.c
rawstrr.obj: ../lib/rawstr.c curl_rawstrr.obj: ../lib/curl_rawstr.c
$(CCR) $(CFLAGS) /Fo"$@" ../lib/rawstr.c $(CCR) $(CFLAGS) /Fo"$@" ../lib/curl_rawstr.c
strtoofftr.obj: ../lib/strtoofft.c curl_strtoofftr.obj: ../lib/curl_strtoofft.c
$(CCR) $(CFLAGS) /Fo"$@" ../lib/strtoofft.c $(CCR) $(CFLAGS) /Fo"$@" ../lib/curl_strtoofft.c
tool_binmoder.obj: tool_binmode.c tool_binmoder.obj: tool_binmode.c
$(CCR) $(CFLAGS) /Fo"$@" tool_binmode.c $(CCR) $(CFLAGS) /Fo"$@" tool_binmode.c
tool_bnamer.obj: tool_bname.c tool_bnamer.obj: tool_bname.c
@ -427,12 +427,12 @@ curlr.res : curl.rc
$(RCR) $(RESFLAGS) /Fo"$@" curl.rc $(RCR) $(RESFLAGS) /Fo"$@" curl.rc
## Debug ## Debug
nonblockd.obj: ../lib/nonblock.c curl_nonblockd.obj: ../lib/curl_nonblock.c
$(CCD) $(CFLAGS) /Fo"$@" ../lib/nonblock.c $(CCD) $(CFLAGS) /Fo"$@" ../lib/curl_nonblock.c
rawstrd.obj: ../lib/rawstr.c curl_rawstrd.obj: ../lib/curl_rawstr.c
$(CCD) $(CFLAGS) /Fo"$@" ../lib/rawstr.c $(CCD) $(CFLAGS) /Fo"$@" ../lib/curl_rawstr.c
strtoofftd.obj: ../lib/strtoofft.c curl_strtoofftd.obj: ../lib/curl_strtoofft.c
$(CCD) $(CFLAGS) /Fo"$@" ../lib/strtoofft.c $(CCD) $(CFLAGS) /Fo"$@" ../lib/curl_strtoofft.c
tool_binmoded.obj: tool_binmode.c tool_binmoded.obj: tool_binmode.c
$(CCD) $(CFLAGS) /Fo"$@" tool_binmode.c $(CCD) $(CFLAGS) /Fo"$@" tool_binmode.c
tool_bnamed.obj: tool_bname.c tool_bnamed.obj: tool_bname.c

4
src/tool_operate.c
Просмотреть файл

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -849,7 +849,7 @@ int operate(struct Configurable *config, int argc, argv_item_t argv[])
input.fd = infd; input.fd = infd;
input.config = config; input.config = config;
/* Note that if CURLOPT_READFUNCTION is fread (the default), then /* Note that if CURLOPT_READFUNCTION is fread (the default), then
* lib/telnet.c will Curl_poll() on the input file descriptor * lib/curl_telnet.c will Curl_poll() on the input file descriptor
* rather then calling the READFUNCTION at regular intervals. * rather then calling the READFUNCTION at regular intervals.
* The circumstances in which it is preferable to enable this * The circumstances in which it is preferable to enable this
* behaviour, by omitting to set the READFUNCTION & READDATA options, * behaviour, by omitting to set the READFUNCTION & READDATA options,

6
src/vc6curlsrc.dsp
Просмотреть файл

@ -139,15 +139,15 @@ LINK32=link.exe
# PROP Default_Filter "" # PROP Default_Filter ""
# Begin Source File # Begin Source File
SOURCE=..\lib\nonblock.c SOURCE=..\lib\curl_nonblock.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\lib\rawstr.c SOURCE=..\lib\curl_rawstr.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\lib\strtoofft.c SOURCE=..\lib\curl_strtoofft.c
# End Source File # End Source File
# Begin Source File # Begin Source File

2
tests/libtest/Makefile.inc
Просмотреть файл

@ -5,7 +5,7 @@ TESTUTIL = testutil.c testutil.h
TSTTRACE = testtrace.c testtrace.h TSTTRACE = testtrace.c testtrace.h
# files used only in some libcurl test programs # files used only in some libcurl test programs
WARNLESS = $(top_srcdir)/lib/warnless.c $(top_srcdir)/lib/curl_warnless.h WARNLESS = $(top_srcdir)/lib/curl_warnless.c $(top_srcdir)/lib/curl_warnless.h
# these files are used in every single test program below # these files are used in every single test program below
SUPPORTFILES = first.c test.h SUPPORTFILES = first.c test.h

4
tests/libtest/lib518.c
Просмотреть файл

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -386,7 +386,7 @@ static int rlimit(int keep_open)
* when using select() instead of poll() we cannot test * when using select() instead of poll() we cannot test
* libcurl functionality with a socket number equal or * libcurl functionality with a socket number equal or
* greater than FD_SETSIZE. In any case, macro VERIFY_SOCK * greater than FD_SETSIZE. In any case, macro VERIFY_SOCK
* in lib/select.c enforces this check and protects libcurl * in lib/curl_select.c enforces this check and protects libcurl
* from a possible crash. The effect of this protection * from a possible crash. The effect of this protection
* is that test 518 will always fail, since the actual * is that test 518 will always fail, since the actual
* call to select() never takes place. We skip test 518 * call to select() never takes place. We skip test 518

4
tests/libtest/lib537.c
Просмотреть файл

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -389,7 +389,7 @@ static int rlimit(int keep_open)
* when using select() instead of poll() we cannot test * when using select() instead of poll() we cannot test
* libcurl functionality with a socket number equal or * libcurl functionality with a socket number equal or
* greater than FD_SETSIZE. In any case, macro VERIFY_SOCK * greater than FD_SETSIZE. In any case, macro VERIFY_SOCK
* in lib/select.c enforces this check and protects libcurl * in lib/curl_select.c enforces this check and protects libcurl
* from a possible crash. The effect of this protection * from a possible crash. The effect of this protection
* is that test 537 will always fail, since the actual * is that test 537 will always fail, since the actual
* call to select() never takes place. We skip test 537 * call to select() never takes place. We skip test 537

16
tests/memanalyze.pl
Просмотреть файл

@ -6,7 +6,7 @@
# | (__| |_| | _ <| |___ # | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____| # \___|\___/|_| \_\_____|
# #
# Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. # Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
# #
# This software is licensed as described in the file COPYING, which # This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms # you should have received as part of this distribution. The terms
@ -23,9 +23,9 @@
# #
# Example input: # Example input:
# #
# MEM mprintf.c:1094 malloc(32) = e5718 # MEM curl_mprintf.c:1094 malloc(32) = e5718
# MEM mprintf.c:1103 realloc(e5718, 64) = e6118 # MEM curl_mprintf.c:1103 realloc(e5718, 64) = e6118
# MEM sendf.c:232 free(f6520) # MEM curl_sendf.c:232 free(f6520)
my $mallocs=0; my $mallocs=0;
my $callocs=0; my $callocs=0;
@ -224,7 +224,7 @@ while(<FILE>) {
print "Not recognized input line: $function\n"; print "Not recognized input line: $function\n";
} }
} }
# FD url.c:1282 socket() = 5 # FD curl_url.c:1282 socket() = 5
elsif($_ =~ /^FD ([^ ]*):(\d*) (.*)/) { elsif($_ =~ /^FD ([^ ]*):(\d*) (.*)/) {
# generic match for the filename+linenumber # generic match for the filename+linenumber
$source = $1; $source = $1;
@ -259,7 +259,7 @@ while(<FILE>) {
} }
} }
} }
# FILE url.c:1282 fopen("blabla") = 0x5ddd # FILE curl_url.c:1282 fopen("blabla") = 0x5ddd
elsif($_ =~ /^FILE ([^ ]*):(\d*) (.*)/) { elsif($_ =~ /^FILE ([^ ]*):(\d*) (.*)/) {
# generic match for the filename+linenumber # generic match for the filename+linenumber
$source = $1; $source = $1;
@ -287,12 +287,12 @@ while(<FILE>) {
} }
} }
} }
# GETNAME url.c:1901 getnameinfo() # GETNAME curl_url.c:1901 getnameinfo()
elsif($_ =~ /^GETNAME ([^ ]*):(\d*) (.*)/) { elsif($_ =~ /^GETNAME ([^ ]*):(\d*) (.*)/) {
# not much to do # not much to do
} }
# ADDR url.c:1282 getaddrinfo() = 0x5ddd # ADDR curl_url.c:1282 getaddrinfo() = 0x5ddd
elsif($_ =~ /^ADDR ([^ ]*):(\d*) (.*)/) { elsif($_ =~ /^ADDR ([^ ]*):(\d*) (.*)/) {
# generic match for the filename+linenumber # generic match for the filename+linenumber
$source = $1; $source = $1;

12
tests/server/CMakeLists.txt
Просмотреть файл

@ -56,16 +56,16 @@ endforeach()
# SET(useful # SET(useful
# getpart.c getpart.h # getpart.c getpart.h
# ${CURL_SOURCE_DIR}/lib/strequal.c # ${CURL_SOURCE_DIR}/lib/curl_strequal.c
# ${CURL_SOURCE_DIR}/lib/base64.c # ${CURL_SOURCE_DIR}/lib/curl_base64.c
# ${CURL_SOURCE_DIR}/lib/mprintf.c # ${CURL_SOURCE_DIR}/lib/curl_mprintf.c
# ${CURL_SOURCE_DIR}/lib/memdebug.c # ${CURL_SOURCE_DIR}/lib/curl_memdebug.c
# ${CURL_SOURCE_DIR}/lib/timeval.c # ${CURL_SOURCE_DIR}/lib/curl_timeval.c
# ) # )
# SETUP_EXECUTABLE(sws sws.c util.c util.h ${useful}) # SETUP_EXECUTABLE(sws sws.c util.c util.h ${useful})
# SETUP_EXECUTABLE(resolve resolve.c util.c util.h ${useful}) # SETUP_EXECUTABLE(resolve resolve.c util.c util.h ${useful})
# SETUP_EXECUTABLE(sockfilt sockfilt.c util.c util.h ${useful} ${CURL_SOURCE_DIR}/lib/inet_pton.c) # SETUP_EXECUTABLE(sockfilt sockfilt.c util.c util.h ${useful} ${CURL_SOURCE_DIR}/lib/curl_inet_pton.c)
# SETUP_EXECUTABLE(getpart testpart.c ${useful}) # SETUP_EXECUTABLE(getpart testpart.c ${useful})
# SETUP_EXECUTABLE(tftpd tftpd.c util.c util.h ${useful} server_tftp.h) # SETUP_EXECUTABLE(tftpd tftpd.c util.c util.h ${useful} server_tftp.h)

20
tests/server/Makefile.inc
Просмотреть файл

@ -1,12 +1,12 @@
noinst_PROGRAMS = getpart resolve rtspd sockfilt sws tftpd fake_ntlm noinst_PROGRAMS = getpart resolve rtspd sockfilt sws tftpd fake_ntlm
CURLX_SRCS = \ CURLX_SRCS = \
$(top_srcdir)/lib/mprintf.c \ $(top_srcdir)/lib/curl_mprintf.c \
$(top_srcdir)/lib/nonblock.c \ $(top_srcdir)/lib/curl_nonblock.c \
$(top_srcdir)/lib/strequal.c \ $(top_srcdir)/lib/curl_strequal.c \
$(top_srcdir)/lib/strtoofft.c \ $(top_srcdir)/lib/curl_strtoofft.c \
$(top_srcdir)/lib/timeval.c \ $(top_srcdir)/lib/curl_timeval.c \
$(top_srcdir)/lib/warnless.c $(top_srcdir)/lib/curl_warnless.c
CURLX_HDRS = \ CURLX_HDRS = \
$(top_srcdir)/lib/curlx.h \ $(top_srcdir)/lib/curlx.h \
@ -20,9 +20,9 @@ USEFUL = \
getpart.c \ getpart.c \
getpart.h \ getpart.h \
server_setup.h \ server_setup.h \
$(top_srcdir)/lib/base64.c \ $(top_srcdir)/lib/curl_base64.c \
$(top_srcdir)/lib/curl_base64.h \ $(top_srcdir)/lib/curl_base64.h \
$(top_srcdir)/lib/memdebug.c \ $(top_srcdir)/lib/curl_memdebug.c \
$(top_srcdir)/lib/curl_memdebug.h $(top_srcdir)/lib/curl_memdebug.h
UTIL = \ UTIL = \
@ -48,14 +48,14 @@ rtspd_CFLAGS = $(AM_CFLAGS)
sockfilt_SOURCES = $(CURLX_SRCS) $(CURLX_HDRS) $(USEFUL) $(UTIL) \ sockfilt_SOURCES = $(CURLX_SRCS) $(CURLX_HDRS) $(USEFUL) $(UTIL) \
server_sockaddr.h \ server_sockaddr.h \
sockfilt.c \ sockfilt.c \
$(top_srcdir)/lib/inet_pton.c $(top_srcdir)/lib/curl_inet_pton.c
sockfilt_LDADD = @CURL_NETWORK_AND_TIME_LIBS@ sockfilt_LDADD = @CURL_NETWORK_AND_TIME_LIBS@
sockfilt_CFLAGS = $(AM_CFLAGS) sockfilt_CFLAGS = $(AM_CFLAGS)
sws_SOURCES = $(CURLX_SRCS) $(CURLX_HDRS) $(USEFUL) $(UTIL) \ sws_SOURCES = $(CURLX_SRCS) $(CURLX_HDRS) $(USEFUL) $(UTIL) \
server_sockaddr.h \ server_sockaddr.h \
sws.c \ sws.c \
$(top_srcdir)/lib/inet_pton.c $(top_srcdir)/lib/curl_inet_pton.c
sws_LDADD = @CURL_NETWORK_AND_TIME_LIBS@ sws_LDADD = @CURL_NETWORK_AND_TIME_LIBS@
sws_CFLAGS = $(AM_CFLAGS) sws_CFLAGS = $(AM_CFLAGS)

18
winbuild/MakefileBuild.vc
Просмотреть файл

@ -455,9 +455,9 @@ CURL_LIBCURL_LIBNAME=$(LIB_NAME_IMP)
!ENDIF !ENDIF
CURL_FROM_LIBCURL=$(CURL_DIROBJ)\tool_hugehelp.obj \ CURL_FROM_LIBCURL=$(CURL_DIROBJ)\tool_hugehelp.obj \
$(CURL_DIROBJ)\nonblock.obj \ $(CURL_DIROBJ)\curl_nonblock.obj \
$(CURL_DIROBJ)\rawstr.obj \ $(CURL_DIROBJ)\curl_rawstr.obj \
$(CURL_DIROBJ)\strtoofft.obj $(CURL_DIROBJ)\curl_strtoofft.obj
$(PROGRAM_NAME): $(CURL_DIROBJ) $(CURL_FROM_LIBCURL) $(EXE_OBJS) $(PROGRAM_NAME): $(CURL_DIROBJ) $(CURL_FROM_LIBCURL) $(EXE_OBJS)
$(CURL_LINK) $(CURL_LFLAGS) $(CURL_LIBCURL_LIBNAME) $(WIN_LIBS) $(CURL_FROM_LIBCURL) $(EXE_OBJS) $(CURL_LINK) $(CURL_LFLAGS) $(CURL_LIBCURL_LIBNAME) $(WIN_LIBS) $(CURL_FROM_LIBCURL) $(EXE_OBJS)
@ -468,12 +468,12 @@ $(PROGRAM_NAME): $(CURL_DIROBJ) $(CURL_FROM_LIBCURL) $(EXE_OBJS)
$(CURL_DIROBJ)\tool_hugehelp.obj: $(CURL_SRC_DIR)\tool_hugehelp.c $(CURL_DIROBJ)\tool_hugehelp.obj: $(CURL_SRC_DIR)\tool_hugehelp.c
$(CURL_CC) $(CURL_CFLAGS) /Zm200 /Fo"$@" $(CURL_SRC_DIR)\tool_hugehelp.c $(CURL_CC) $(CURL_CFLAGS) /Zm200 /Fo"$@" $(CURL_SRC_DIR)\tool_hugehelp.c
$(CURL_DIROBJ)\nonblock.obj: ../lib/nonblock.c $(CURL_DIROBJ)\curl_nonblock.obj: ../lib/curl_nonblock.c
$(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/nonblock.c $(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/curl_nonblock.c
$(CURL_DIROBJ)\rawstr.obj: ../lib/rawstr.c $(CURL_DIROBJ)\curl_rawstr.obj: ../lib/curl_rawstr.c
$(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/rawstr.c $(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/curl_rawstr.c
$(CURL_DIROBJ)\strtoofft.obj: ../lib/strtoofft.c $(CURL_DIROBJ)\curl_strtoofft.obj: ../lib/curl_strtoofft.c
$(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/strtoofft.c $(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/curl_strtoofft.c
$(CURL_DIROBJ)\curl.res: $(CURL_SRC_DIR)\curl.rc $(CURL_DIROBJ)\curl.res: $(CURL_SRC_DIR)\curl.rc
rc $(CURL_RC_FLAGS) rc $(CURL_RC_FLAGS)