Backed out updated libcurl.
This commit is contained in:
Asher Baker
@@ -57,5 +57,4 @@ EXPORTS
|
||||
curl_version_info @ 56 NONAME
|
||||
curl_easy_recv @ 57 NONAME
|
||||
curl_easy_send @ 58 NONAME
|
||||
curl_multi_wait @ 59 NONAME
|
||||
|
||||
|
||||
@@ -57,5 +57,4 @@ EXPORTS
|
||||
curl_version_info @ 56 NONAME
|
||||
curl_easy_recv @ 57 NONAME
|
||||
curl_easy_send @ 58 NONAME
|
||||
curl_multi_wait @ 59 NONAME
|
||||
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
//
|
||||
// libcurl and curl bld.inf file for Symbian OS
|
||||
//
|
||||
PRJ_EXPORTS
|
||||
libcurl.iby /epoc32/rom/include/libcurl.iby
|
||||
curl.iby /epoc32/rom/include/curl.iby
|
||||
|
||||
PRJ_MMPFILES
|
||||
libcurl.mmp
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
//
|
||||
//
|
||||
// curl file transfer utility command-line utility
|
||||
//
|
||||
// Use this file with buildrom to add curl to a device ROM
|
||||
//
|
||||
//
|
||||
|
||||
#ifndef CURL_IBY
|
||||
#define CURL_IBY
|
||||
@@ -10,6 +10,6 @@
|
||||
#include <openenv.iby>
|
||||
#include <libcurl.iby>
|
||||
|
||||
file=ABI_DIR\BUILD_DIR\curl.exe \sys\bin\curl.exe
|
||||
file=ABI_DIR\BUILD_DIR\curl.exe System\Programs\curl.exe
|
||||
|
||||
#endif // CURL_IBY
|
||||
|
||||
@@ -8,48 +8,12 @@ UID 0x00000000 0xF0206442
|
||||
|
||||
SOURCEPATH ../../../src
|
||||
SOURCE \
|
||||
tool_binmode.c \
|
||||
tool_bname.c \
|
||||
tool_cb_dbg.c \
|
||||
tool_cb_hdr.c \
|
||||
tool_cb_prg.c \
|
||||
tool_cb_rea.c \
|
||||
tool_cb_see.c \
|
||||
tool_cb_wrt.c \
|
||||
tool_cfgable.c \
|
||||
tool_convert.c \
|
||||
tool_dirhie.c \
|
||||
tool_doswin.c \
|
||||
tool_easysrc.c \
|
||||
tool_formparse.c \
|
||||
tool_getparam.c \
|
||||
tool_getpass.c \
|
||||
tool_help.c \
|
||||
tool_helpers.c \
|
||||
tool_homedir.c \
|
||||
tool_hugehelp.c \
|
||||
tool_libinfo.c \
|
||||
tool_main.c \
|
||||
tool_metalink.c \
|
||||
tool_mfiles.c \
|
||||
tool_msgs.c \
|
||||
tool_operate.c \
|
||||
tool_operhlp.c \
|
||||
tool_panykey.c \
|
||||
tool_paramhlp.c \
|
||||
tool_parsecfg.c \
|
||||
tool_setopt.c \
|
||||
tool_sleep.c \
|
||||
tool_urlglob.c \
|
||||
tool_util.c \
|
||||
tool_vms.c \
|
||||
tool_writeenv.c \
|
||||
tool_writeout.c \
|
||||
tool_xattr.c
|
||||
main.c hugehelp.c urlglob.c writeout.c writeenv.c \
|
||||
getpass.c homedir.c curlutil.c
|
||||
|
||||
SOURCEPATH ../../../lib
|
||||
SOURCE \
|
||||
rawstr.c nonblock.c
|
||||
rawstr.c
|
||||
|
||||
USERINCLUDE ../../../src ../../../lib ../../../include/curl
|
||||
|
||||
|
||||
@@ -6,21 +6,21 @@
|
||||
|
||||
;Header - standard sis file header including version number
|
||||
;Version scheme: curl's major, curl's minor, curl's subminor*100 + build number
|
||||
; e.g. The third Symbian package of curl ver. 7.20.1 would have a SIS package
|
||||
; version of 7, 20, 103
|
||||
#{"curl"}, (0xF0206442), 7, 20, <please_update_version>, TYPE=SA
|
||||
; e.g. The third Symbian package of curl ver. 7.18.2 would have a SIS package
|
||||
; version of 7, 18, 203
|
||||
#{"curl"}, (0xF0206442), 7, 18, <please_update_version>, TYPE=SA
|
||||
|
||||
; Vendor name
|
||||
%{"curl project"}
|
||||
:"curl project"
|
||||
%{"Standard libcurl package"}
|
||||
:"Standard libcurl package"
|
||||
|
||||
; Embedded component
|
||||
@"libcurl.sis",(0xF0206D00)
|
||||
|
||||
; A dependency on P.I.P.S. and the stdio server are probably good to have here
|
||||
;(0x20009A80), *, *, *, {"Open C Standard Libraries"}
|
||||
;(0x20009A80), *, *, *, {"P.I.P.S. for Series 60 3rd ed."}
|
||||
;(0x20009A81), *, *, *, {"P.I.P.S. for UIQ 3"}
|
||||
;(0x20009AA2), *, *, *, {"Symbian OS STDIOSERVER"}
|
||||
|
||||
;Files - standard file specifications
|
||||
"\epoc32\release\armv5\urel\curl.exe" - "$:\sys\bin\curl.exe"
|
||||
"epoc32\release\armv5\urel\curl.exe" - "$:\sys\bin\curl.exe"
|
||||
|
||||
@@ -9,6 +9,6 @@
|
||||
|
||||
#include <openenv.iby>
|
||||
|
||||
file=ABI_DIR\BUILD_DIR\libcurl.dll \sys\bin\libcurl.dll
|
||||
file=ABI_DIR\BUILD_DIR\libcurl.dll System\Libs\libcurl.dll
|
||||
|
||||
#endif // LIBCURL_IBY
|
||||
#endif
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
// libcurl.dll cURL network retrieval client library
|
||||
//
|
||||
|
||||
// Build-time options (uncomment these to enable)
|
||||
#define ENABLE_ZLIB // Enable gzip/deflate decompression
|
||||
// Build-time options
|
||||
//#define ENABLE_ZLIB // Enable gzip/deflate decompression
|
||||
//#define ENABLE_SSL // Enable SSL for HTTPS/FTPS (requires S60 Open C SDK)
|
||||
|
||||
TARGET libcurl.dll
|
||||
@@ -16,36 +16,23 @@ MACRO BUILDING_LIBCURL
|
||||
MACRO HAVE_LIBZ
|
||||
#endif
|
||||
#ifdef ENABLE_SSL
|
||||
MACRO USE_SSLEAY
|
||||
MACRO USE_SSL
|
||||
#endif
|
||||
|
||||
SOURCEPATH ../../../lib
|
||||
SOURCE \
|
||||
file.c timeval.c base64.c hostip.c progress.c formdata.c \
|
||||
cookie.c http.c sendf.c ftp.c url.c dict.c if2ip.c speedcheck.c \
|
||||
ldap.c ssluse.c version.c getenv.c escape.c mprintf.c telnet.c \
|
||||
netrc.c getinfo.c transfer.c strequal.c easy.c security.c krb4.c \
|
||||
curl_fnmatch.c fileinfo.c ftplistparser.c wildcard.c krb5.c \
|
||||
memdebug.c http_chunks.c strtok.c connect.c llist.c hash.c multi.c \
|
||||
content_encoding.c share.c http_digest.c md4.c md5.c curl_rand.c \
|
||||
http_negotiate.c inet_pton.c strtoofft.c strerror.c amigaos.c \
|
||||
hostasyn.c hostip4.c hostip6.c hostsyn.c inet_ntop.c parsedate.c \
|
||||
select.c gtls.c sslgen.c tftp.c splay.c strdup.c socks.c ssh.c nss.c \
|
||||
qssl.c rawstr.c curl_addrinfo.c socks_gssapi.c socks_sspi.c \
|
||||
curl_sspi.c slist.c nonblock.c curl_memrchr.c imap.c pop3.c smtp.c \
|
||||
pingpong.c rtsp.c curl_threads.c warnless.c hmac.c polarssl.c \
|
||||
curl_rtmp.c openldap.c curl_gethostname.c gopher.c axtls.c \
|
||||
idn_win32.c http_negotiate_sspi.c cyassl.c http_proxy.c non-ascii.c \
|
||||
asyn-ares.c asyn-thread.c curl_gssapi.c curl_ntlm.c curl_ntlm_wb.c \
|
||||
curl_ntlm_core.c curl_ntlm_msgs.c curl_sasl.c curl_schannel.c \
|
||||
curl_multibyte.c curl_darwinssl.c bundles.c conncache.c
|
||||
file.c timeval.c base64.c hostip.c progress.c formdata.c \
|
||||
cookie.c http.c sendf.c ftp.c url.c dict.c if2ip.c speedcheck.c \
|
||||
ldap.c ssluse.c version.c getenv.c escape.c mprintf.c telnet.c \
|
||||
netrc.c getinfo.c transfer.c strequal.c easy.c security.c krb4.c \
|
||||
krb5.c memdebug.c http_chunks.c strtok.c connect.c llist.c hash.c \
|
||||
multi.c content_encoding.c share.c http_digest.c md5.c \
|
||||
http_negotiate.c http_ntlm.c inet_pton.c strtoofft.c strerror.c \
|
||||
hostares.c hostasyn.c hostip4.c hostip6.c hostsyn.c hostthre.c \
|
||||
inet_ntop.c parsedate.c select.c gtls.c sslgen.c tftp.c splay.c \
|
||||
strdup.c socks.c ssh.c nss.c qssl.c rawstr.c curl_addrinfo.c
|
||||
|
||||
USERINCLUDE ../../../lib ../../../include/curl
|
||||
#ifdef ENABLE_SSL
|
||||
SYSTEMINCLUDE /epoc32/include/osextensions/stdapis
|
||||
// Older versions of the SDK need this instead:
|
||||
//USERINCLUDE /epoc32/include/stdapis/openssl
|
||||
#endif
|
||||
|
||||
SYSTEMINCLUDE ../../../include /epoc32/include/stdapis /epoc32/include
|
||||
|
||||
|
||||
@@ -6,17 +6,17 @@
|
||||
|
||||
;Header - standard sis file header including version number
|
||||
;Version scheme: curl's major, curl's minor, curl's subminor*100 + build number
|
||||
; e.g. The third Symbian package of curl ver. 7.20.1 would have a SIS package
|
||||
; version of 7, 20, 103
|
||||
#{"libcurl"}, (0xF0206D00), 7, 20, <please_update_version>, TYPE=SA
|
||||
; e.g. The third Symbian package of curl ver. 7.18.2 would have a SIS package
|
||||
; version of 7, 18, 203
|
||||
#{"libcurl"}, (0xF0206D00), 7, 18, <please_update_version>, TYPE=SA
|
||||
|
||||
; Vendor name
|
||||
%{"curl project"}
|
||||
:"curl project"
|
||||
%{"Standard curl package"}
|
||||
:"Standard curl package"
|
||||
|
||||
; A dependency on P.I.P.S. is probably a good idea to add here
|
||||
;(0x20009A80), *, *, *, {"Open C Standard Libraries"}
|
||||
;(0x20009A80), *, *, *, {"P.I.P.S. for Series 60 3rd ed."}
|
||||
;(0x20009A81), *, *, *, {"P.I.P.S. for UIQ 3"}
|
||||
|
||||
;Files - standard file specifications
|
||||
"\epoc32\release\armv5\urel\libcurl.dll" - "$:\sys\bin\libcurl.dll"
|
||||
"epoc32\release\armv5\urel\libcurl.dll" - "$:\sys\bin\libcurl.dll"
|
||||
|
||||
@@ -9,11 +9,11 @@ from client applications as well as creating a GUI application to allow
|
||||
file transfers. The author has no current plans to do so.
|
||||
|
||||
This means that integration with standard Symbian OS programs can be
|
||||
tricky, since libcurl isn't designed with Symbian's native asynchronous
|
||||
tricky, since libcurl isn't designed with Symbian's native asynchronous
|
||||
message passing idioms in mind. However, it may be possible to use libcurl
|
||||
in an active object-based application through libcurl's multi interface.
|
||||
The port is most easily used when porting POSIX applications to Symbian
|
||||
OS using P.I.P.S. (a.k.a. Open C).
|
||||
OS using P.I.P.S.
|
||||
|
||||
libcurl is built as a standard Symbian ordinal-linked DLL, and curl is
|
||||
built as a text mode EXE application. They have not been Symbian
|
||||
@@ -63,25 +63,20 @@ calling certain other libcurl functions) before any libcurl functions
|
||||
that could allocate memory (like curl_getenv()).
|
||||
|
||||
P.I.P.S. doesn't support signals or the alarm() call, so some timeouts
|
||||
(such as the connect timeout) are not honoured. This should not be
|
||||
an issue once support for CURLRES_THREADED is added for Symbian.
|
||||
(such as the connect timeout) are not honoured.
|
||||
|
||||
P.I.P.S. causes a USER:87 panic if certain timeouts much longer than
|
||||
half an hour are selected.
|
||||
|
||||
LDAP, SCP or SFTP methods are not supported due to lack of support for
|
||||
the dependent libaries on Symbian.
|
||||
LDAP, SCP or SFTP methods are not supported.
|
||||
|
||||
gzip and deflate decompression is supported when the appropriate macro
|
||||
is uncommented in the libcurl.mmp file.
|
||||
gzip and deflate decompression is supported when enabled in the libcurl.mmp
|
||||
file.
|
||||
|
||||
SSL/TLS encryption is not enabled by default, but it is possible to add
|
||||
when the OpenSSL libraries included in the S60 Open C SDK are available.
|
||||
The appropriate macro in the libcurl.mmp file must be uncommented to
|
||||
enable support.
|
||||
|
||||
NTLM authentication may not work on some servers due to the lack of
|
||||
MD4 support in the OpenSSL libraries included with Open C.
|
||||
SSL/TLS encryption is not supported by default, but it has been reported
|
||||
to be made working with macros similar to the ones in config-symbian.h
|
||||
and libcurl.mmp. This requires the OpenSSL libraries included in the S60
|
||||
Open C SDK.
|
||||
|
||||
Debug builds are not supported (i.e. --enable-debug) because they cause
|
||||
additional symbol exports in the library which are not frozen in the .def
|
||||
@@ -90,4 +85,4 @@ files.
|
||||
|
||||
Dan Fandrich
|
||||
[email protected]
|
||||
March 2010
|
||||
October 2008
|
||||
|
||||
Reference in New Issue
Block a user