Backed out updated libcurl.

This commit is contained in:
Asher Baker
2013-03-18 00:55:59 +00:00
parent 9b65900df0
commit e84f6e4afd
1511 changed files with 161513 additions and 213368 deletions
@@ -1,3 +1,4 @@
$Id: README.OS400,v 1.10 2008-10-17 13:17:41 patrickm Exp $
Implementation notes:
@@ -70,52 +71,40 @@ options:
CURLOPT_COOKIEFILE
CURLOPT_COOKIEJAR
CURLOPT_COOKIELIST
CURLOPT_COPYPOSTFIELDS
CURLOPT_CRLFILE
CURLOPT_CUSTOMREQUEST
CURLOPT_DNS_SERVERS
CURLOPT_EGDSOCKET
CURLOPT_ENCODING
CURLOPT_FTPPORT
CURLOPT_FTP_ACCOUNT
CURLOPT_FTP_ALTERNATIVE_TO_USER
CURLOPT_FTPPORT
CURLOPT_INTERFACE
CURLOPT_ISSUERCERT
CURLOPT_KEYPASSWD
CURLOPT_KRBLEVEL
CURLOPT_MAIL_FROM
CURLOPT_MAIL_AUTH
CURLOPT_NETRC_FILE
CURLOPT_NOPROXY
CURLOPT_PASSWORD
CURLOPT_COPYPOSTFIELDS
CURLOPT_PROXY
CURLOPT_PROXYPASSWORD
CURLOPT_PROXYUSERNAME
CURLOPT_PROXYUSERPWD
CURLOPT_RANDOM_FILE
CURLOPT_RANGE
CURLOPT_REFERER
CURLOPT_RTSP_SESSION_UID
CURLOPT_RTSP_STREAM_URI
CURLOPT_RTSP_TRANSPORT
CURLOPT_SOCKS5_GSSAPI_SERVICE
CURLOPT_SSH_HOST_PUBLIC_KEY_MD5 Note: SSH not available on OS400.
CURLOPT_SSH_KNOWNHOSTS Note: SSH not available on OS400.
CURLOPT_SSH_PRIVATE_KEYFILE Note: SSH not available on OS400.
CURLOPT_SSH_PUBLIC_KEYFILE Note: SSH not available on OS400.
CURLOPT_SSH_PRIVATE_KEYFILE
CURLOPT_SSH_PUBLIC_KEYFILE
CURLOPT_SSLCERT
CURLOPT_SSLCERTTYPE
CURLOPT_SSL_CIPHER_LIST
CURLOPT_SSLENGINE
CURLOPT_SSLKEY
CURLOPT_SSLKEYTYPE
CURLOPT_TLSAUTH_PASSWORD
CURLOPT_TLSAUTH_TYPE
CURLOPT_TLSAUTH_USERNAME
CURLOPT_SSL_CIPHER_LIST
CURLOPT_URL
CURLOPT_USERAGENT
CURLOPT_USERNAME
CURLOPT_USERPWD
CURLOPT_SSH_HOST_PUBLIC_KEY_MD5
CURLOPT_CRLFILE
CURLOPT_ISSUERCERT
CURLOPT_USERNAME
CURLOPT_PASSWORD
CURLOPT_PROXYUSERNAME
CURLOPT_PROXYPASSWORD
Else it is the same as for curl_easy_setopt().
Note that CURLOPT_ERRORBUFFER is not in the list above, since it gives the
address of an (empty) character buffer, not the address of a string.
@@ -150,10 +139,6 @@ use:
CURLINFO_EFFECTIVE_URL
CURLINFO_CONTENT_TYPE
CURLINFO_FTP_ENTRY_PATH
CURLINFO_REDIRECT_URL
CURLINFO_PRIMARY_IP
CURLINFO_RTSP_SESSION_ID
CURLINFO_LOCAL_IP
Other options are processed like in curl_easy_getinfo().
Standard compilation environment does support neither autotools nor make;
@@ -166,27 +151,14 @@ OS/400.
Protocols currently implemented on OS/400:
_ DICT
_ FILE
_ FTP
_ FTPS
_ FTP with secure transmission
_ GOPHER
_ HTTP
_ HTTPS
_ IMAP
_ IMAPS
_ IMAP with secure transmission
_ FTP
_ FTPS
_ FTP with secure transmission.
_ LDAP
_ POP3
_ POP3S
_ POP3 with secure transmission
_ RTSP
_ SMTP
_ SMTPS
_ SMTP with secure transmission
_ DICT
_ TELNET
_ TFTP
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
* Copyright (C) 1998 - 2010, Daniel Stenberg, <[email protected]>, et al.
* Copyright (C) 1998 - 2008, Daniel Stenberg, <[email protected]>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -18,6 +18,7 @@
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
* $Id: ccsidcurl.c,v 1.12 2008-10-17 13:17:41 patrickm Exp $
*
***************************************************************************/
@@ -31,8 +32,8 @@
#pragma enum(int)
#include "curl.h"
#include "mprintf.h"
#include <curl/curl.h>
#include <curl/mprintf.h>
#include "urldata.h"
#include "url.h"
#include "getinfo.h"
@@ -1029,11 +1030,7 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...)
if (testwarn) {
testwarn = 0;
#ifdef USE_TLS_SRP
if ((int) STRING_LAST != (int) STRING_TLSAUTH_PASSWORD + 1)
#else
if ((int) STRING_LAST != (int) STRING_MAIL_AUTH + 1)
#endif
if ((int) STRING_LAST != (int) STRING_PROXYPASSWORD + 1)
curl_mfprintf(stderr,
"*** WARNING: curl_easy_setopt_ccsid() should be reworked ***\n");
}
@@ -1049,51 +1046,39 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...)
case CURLOPT_COOKIEFILE:
case CURLOPT_COOKIEJAR:
case CURLOPT_COOKIELIST:
case CURLOPT_CRLFILE:
case CURLOPT_CUSTOMREQUEST:
case CURLOPT_DNS_SERVERS:
case CURLOPT_EGDSOCKET:
case CURLOPT_ENCODING:
case CURLOPT_FTPPORT:
case CURLOPT_FTP_ACCOUNT:
case CURLOPT_FTP_ALTERNATIVE_TO_USER:
case CURLOPT_FTPPORT:
case CURLOPT_INTERFACE:
case CURLOPT_ISSUERCERT:
case CURLOPT_KEYPASSWD:
case CURLOPT_KRBLEVEL:
case CURLOPT_MAIL_FROM:
case CURLOPT_MAIL_AUTH:
case CURLOPT_NETRC_FILE:
case CURLOPT_NOPROXY:
case CURLOPT_PASSWORD:
case CURLOPT_PROXY:
case CURLOPT_PROXYPASSWORD:
case CURLOPT_PROXYUSERNAME:
case CURLOPT_PROXYUSERPWD:
case CURLOPT_RANDOM_FILE:
case CURLOPT_RANGE:
case CURLOPT_REFERER:
case CURLOPT_RTSP_SESSION_ID:
case CURLOPT_RTSP_STREAM_URI:
case CURLOPT_RTSP_TRANSPORT:
case CURLOPT_SOCKS5_GSSAPI_SERVICE:
case CURLOPT_SSH_HOST_PUBLIC_KEY_MD5:
case CURLOPT_SSH_KNOWNHOSTS:
case CURLOPT_SSH_PRIVATE_KEYFILE:
case CURLOPT_SSH_PUBLIC_KEYFILE:
case CURLOPT_SSLCERT:
case CURLOPT_SSLCERTTYPE:
case CURLOPT_SSL_CIPHER_LIST:
case CURLOPT_SSLENGINE:
case CURLOPT_SSLKEY:
case CURLOPT_SSLKEYTYPE:
case CURLOPT_TLSAUTH_PASSWORD:
case CURLOPT_TLSAUTH_TYPE:
case CURLOPT_TLSAUTH_USERNAME:
case CURLOPT_SSL_CIPHER_LIST:
case CURLOPT_URL:
case CURLOPT_USERAGENT:
case CURLOPT_USERNAME:
case CURLOPT_USERPWD:
case CURLOPT_SSH_HOST_PUBLIC_KEY_MD5:
case CURLOPT_CRLFILE:
case CURLOPT_ISSUERCERT:
case CURLOPT_USERNAME:
case CURLOPT_PASSWORD:
case CURLOPT_PROXYUSERNAME:
case CURLOPT_PROXYPASSWORD:
s = va_arg(arg, char *);
ccsid = va_arg(arg, unsigned int);
@@ -18,15 +18,16 @@
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
* $Id: ccsidcurl.h,v 1.2 2008-01-16 16:04:47 patrickm Exp $
*
***************************************************************************/
#ifndef __CURL_CCSIDCURL_H
#define __CURL_CCSIDCURL_H
#include "curl.h"
#include "easy.h"
#include "multi.h"
#include <curl.h>
#include <easy.h>
#include <multi.h>
CURL_EXTERN char * curl_version_ccsid(unsigned int ccsid);
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
* Copyright (C) 1998 - 2011, Daniel Stenberg, <[email protected]>, et al.
* Copyright (C) 1998 - 2008, Daniel Stenberg, <[email protected]>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -18,6 +18,7 @@
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
* ANY KIND, either express or implied.
*
* $Id: curl.inc.in,v 1.15 2008-10-17 13:17:41 patrickm Exp $
*
**************************************************************************
*
@@ -48,18 +49,6 @@
d CURL_SOCKET_TIMEOUT...
d c -1
*
/if not defined(CURL_MAX_WRITE_SIZE)
/define CURL_MAX_WRITE_SIZE
d CURL_MAX_WRITE_SIZE...
d c 16384
/endif
*
/if not defined(CURL_MAX_HTTP_HEADER)
/define CURL_MAX_HTTP_HEADER
d CURL_MAX_HTTP_HEADER...
d c 102400
/endif
*
d CURLINFO_STRING...
d c X'00100000'
d CURLINFO_LONG c X'00200000'
@@ -107,12 +96,6 @@
d c X'00000800'
d CURL_VERSION_CONV...
d c X'00001000'
d CURL_VERSION_CURLDEBUG...
d c X'00002000'
d CURL_VERSION_TLSAUTH_SRP...
d c X'00004000'
d CURL_VERSION_NTLM_WB...
d c X'00008000'
*
d HTTPPOST_FILENAME...
d c X'00000001'
@@ -129,13 +112,6 @@
d HTTPPOST_CALLBACK...
d c X'00000040'
*
d CURL_SEEKFUNC_OK...
d c 0
d CURL_SEEKFUNC_FAIL...
d c 1
d CURL_SEEKFUNC_CANTSEEK...
d c 2
*
d CURL_READFUNC_ABORT...
d c X'10000000'
d CURL_READFUNC_PAUSE...
@@ -151,15 +127,9 @@
d CURLAUTH_GSSNEGOTIATE...
d c X'00000004'
d CURLAUTH_NTLM c X'00000008'
d CURLAUTH_DIGEST_IE...
d c X'00000010'
d CURLAUTH_NTLM_WB...
d c X'00000020'
d CURLAUTH_ONLY...
d c X'80000000'
d CURLAUTH_ANY c X'7FFFFFEF'
d CURLAUTH_ANY c X'7FFFFFFF'
d CURLAUTH_ANYSAFE...
d c X'7FFFFFEE'
d c X'7FFFFFFE' ~CURLAUTH_BASIC
*
d CURLSSH_AUTH_ANY...
d c X'7FFFFFFF'
@@ -173,18 +143,9 @@
d c X'00000004'
d CURLSSH_AUTH_KEYBOARD...
d c X'00000008'
d CURLSSH_AUTH_AGENT...
d c X'00000010'
d CURLSSH_AUTH_DEFAULT...
d c X'7FFFFFFF' CURLSSH_AUTH_ANY
*
d CURLGSSAPI_DELEGATION_NONE...
d c 0
d CURLGSSAPI_DELEGATION_POLICY_FLAG...
d c X'00000001'
d CURLGSSAPI_DELEGATION_FLAG...
d c X'00000002'
*
d CURL_ERROR_SIZE...
d c 256
*
@@ -227,21 +188,14 @@
d CURL_SSLVERSION_SSLv3...
d c 3
*
d CURL_TLSAUTH_NONE...
d c 0
d CURL_TLSAUTH_SRP...
d c 1
*
d CURL_REDIR_GET_ALL...
d c 0
d CURL_REDIR_POST_301...
d c 1
d CURL_REDIR_POST_302...
d c 2
d CURL_REDIR_POST_303...
d c 4
d CURL_REDIR_POST_ALL...
d c 7
d c 3
*
d CURL_POLL_NONE c 0
d CURL_POLL_IN c 1
@@ -267,49 +221,6 @@
d CURLPAUSE_ALL c X'00000005'
d CURLPAUSE_CONT c X'00000000'
*
d CURLINFOFLAG_KNOWN_FILENAME...
d c X'00000001'
d CURLINFOFLAG_KNOWN_FILETYPE...
d c X'00000002'
d CURLINFOFLAG_KNOWN_TIME...
d c X'00000004'
d CURLINFOFLAG_KNOWN_PERM...
d c X'00000008'
d CURLINFOFLAG_KNOWN_UID...
d c X'00000010'
d CURLINFOFLAG_KNOWN_GID...
d c X'00000020'
d CURLINFOFLAG_KNOWN_SIZE...
d c X'00000040'
d CURLINFOFLAG_KNOWN_HLINKCOUNT...
d c X'00000080'
*
d CURL_CHUNK_BGN_FUNC_OK...
d c 0
d CURL_CHUNK_BGN_FUNC_FAIL...
d c 1
d CURL_CHUNK_BGN_FUNC_SKIP...
d c 2
*
d CURL_CHUNK_END_FUNC_OK...
d c 0
d CURL_CHUNK_END_FUNC_FAIL...
d c 1
*
d CURL_FNMATCHFUNC_MATCH...
d c 0
d CURL_FNMATCHFUNC_NOMATCH...
d c 1
d CURL_FNMATCHFUNC_FAIL...
d c 2
*
d CURL_WAIT_POLLIN...
d c X'0001'
d CURL_WAIT_POLLPRI...
d c X'0002'
d CURL_WAIT_POLLOUT...
d c X'0004'
*
**************************************************************************
* Types
**************************************************************************
@@ -326,7 +237,7 @@
d c 2
d CURLE_URL_MALFORMAT...
d c 3
d CURLE_NOT_BUILT_IN...
d CURLE_OBSOLETE4...
d c 4
d CURLE_COULDNT_RESOLVE_PROXY...
d c 5
@@ -338,11 +249,11 @@
d c 8
d CURLE_REMOTE_ACCESS_DENIED...
d c 9
d CURLE_FTP_ACCEPT_FAILED...
d CURLE_OBSOLETE10...
d c 10
d CURLE_FTP_WEIRD_PASS_REPLY...
d c 11
d CURLE_FTP_ACCEPT_TIMEOUT...
d CURLE_OBSOLETE12...
d c 12
d CURLE_FTP_WEIRD_PASV_REPLY...
d c 13
@@ -414,7 +325,7 @@
d c 46
d CURLE_TOO_MANY_REDIRECTS...
d c 47
d CURLE_UNKNOWN_OPTION...
d CURLE_UNKNOWN_TELNET_OPTION...
d c 48
d CURLE_TELNET_OPTION_SYNTAX...
d c 49
@@ -486,77 +397,6 @@
d c 82
d CURLE_SSL_ISSUER_ERROR...
d c 83
d CURLE_FTP_PRET_FAILED...
d c 84
d CURLE_RTSP_CSEQ_ERROR...
d c 85
d CURLE_RTSP_SESSION_ERROR...
d c 86
d CURLE_FTP_BAD_FILE_LIST...
d c 87
d CURLE_CHUNK_FAILED...
d c 88
*
/if not defined(CURL_NO_OLDIES)
d CURLE_URL_MALFORMAT_USER...
d c 4
d CURLE_FTP_ACCESS_DENIED...
d c 9
d CURLE_FTP_USER_PASSWORD_INCORRECT...
d c 10
d CURLE_FTP_WEIRD_USER_REPLY...
d c 12
d CURLE_FTP_CANT_RECONNECT...
d c 16
d CURLE_FTP_COULDNT_SET_BINARY...
d c 17
d CURLE_FTP_PARTIAL_FILE...
d c 18
d CURLE_FTP_WRITE_ERROR...
d c 20
d CURLE_FTP_QUOTE_ERROR...
d c 21
d CURLE_HTTP_NOT_FOUND...
d c 22
d CURLE_MALFORMAT_USER...
d c 24
d CURLE_FTP_COULDNT_STOR_FILE...
d c 25
d CURLE_OPERATION_TIMEOUTED...
d c 28
d CURLE_FTP_COULDNT_SET_ASCII...
d c 29
d CURLE_FTP_COULDNT_GET_SIZE...
d c 32
d CURLE_HTTP_RANGE_ERROR...
d c 33
d CURLE_FTP_BAD_DOWNLOAD_RESUME...
d c 36
d CURLE_LIBRARY_NOT_FOUND...
d c 40
d CURLE_BAD_CALLING_ORDER...
d c 44
d CURLE_HTTP_PORT_FAILED...
d c 45
d CURLE_BAD_PASSWORD_ENTERED...
d c 46
d CURLE_UNKNOWN_TELNET_OPTION...
d c 48
d CURLE_OBSOLETE...
d c 50
d CURLE_SSL_PEER_CERTIFICATE...
d c 51
d CURLE_SHARE_IN_USE...
d c 57
d CURLE_FTP_SSL_FAILED...
d c 64
d CURLE_TFTP_DISKFULL...
d c 70
d CURLE_TFTP_EXISTS...
d c 73
d CURLE_ALREADY_COMPLETE...
d c 99999
/endif
*
d curlioerr s 10i 0 based(######ptr######) Enum
d CURLIOE_OK c 0
@@ -565,24 +405,6 @@
d CURLIOE_FAILRESTART...
d c 2
*
d curlfiletype s 10i 0 based(######ptr######) Enum
d CURLFILETYPE_FILE...
d c 0
d CURLFILETYPE_DIRECTORY...
d c 1
d CURLFILETYPE_SYMLINK...
d c 2
d CURLFILETYPE_DEVICE_BLOCK...
d c 3
d CURLFILETYPE_DEVICE_CHAR...
d c 4
d CURLFILETYPE_NAMEDPIPE...
d c 5
d CURLFILETYPE_SOCKET...
d c 6
d CURLFILETYPE_DOOR...
d c 7
*
d curliocmd s 10i 0 based(######ptr######) Enum
d CURLIOCMD_NOP c 0
d CURLIOCMD_RESTARTREAD...
@@ -609,8 +431,6 @@
d curl_proxytype s 10i 0 based(######ptr######) Enum
d CURLPROXY_HTTP...
d c 0
d CURLPROXY_HTTP_1_0...
d c 1
d CURLPROXY_SOCKS4...
d c 4
d CURLPROXY_SOCKS5...
@@ -620,28 +440,6 @@
d CURLPROXY_SOCKS5_HOSTNAME...
d c 7
*
d curl_khstat s 10i 0 based(######ptr######) Enum
d CURLKHSTAT_FINE_ADD_TO_FILE...
d c 0
d CURLKHSTAT_FINE...
d c 1
d CURLKHSTAT_REJECT...
d c 2
d CURLKHSTAT_DEFER...
d c 3
d CURLKHSTAT_LAST...
d c 4
*
d curl_khmatch s 10i 0 based(######ptr######) Enum
d CURLKHMATCH_OK...
d c 0
d CURLKHMATCH_MISMATCH...
d c 1
d CURLKHMATCH_MISSING...
d c 2
d CURLKHMATCH_LAST...
d c 3
*
d curl_usessl s 10i 0 based(######ptr######) Enum
d CURLUSESSL_NONE...
d c 0
@@ -652,22 +450,6 @@
d CURLUSESSL_ALL...
d c 3
*
d CURLSSLOPT_ALLOW_BEAST...
d c 1
*
/if not defined(CURL_NO_OLDIES)
d curl_ftpssl s like(curl_usessl)
d based(######ptr######)
d CURLFTPSSL_NONE...
d c 0
d CURLFTPSSL_TRY...
d c 1
d CURLFTPSSL_CONTROL...
d c 2
d CURLFTPSSL_ALL...
d c 3
/endif
*
d curl_ftpccc s 10i 0 based(######ptr######) Enum
d CURLFTPSSL_CCC_NONE...
d c 0
@@ -682,15 +464,6 @@
d CURLFTPAUTH_SSL...
d c 1
d CURLFTPAUTH_TLS...
d c 2
*
d curl_ftpcreatedir...
d s 10i 0 based(######ptr######) Enum
d CURLFTP_CREATE_DIR_NONE...
d c 0
d CURLFTP_CREATE_DIR...
d c 1
d CURLFTP_CREATE_DIR_RETRY...
d c 2
*
d curl_ftpmethod s 10i 0 based(######ptr######) Enum
@@ -703,59 +476,6 @@
d CURLFTPMETHOD_SINGLECWD...
d c 3
*
d CURLPROTO_HTTP...
d c X'00000001'
d CURLPROTO_HTTPS...
d c X'00000002'
d CURLPROTO_FTP...
d c X'00000004'
d CURLPROTO_FTPS...
d c X'00000008'
d CURLPROTO_SCP...
d c X'00000010'
d CURLPROTO_SFTP...
d c X'00000020'
d CURLPROTO_TELNET...
d c X'00000040'
d CURLPROTO_LDAP...
d c X'00000080'
d CURLPROTO_LDAPS...
d c X'00000100'
d CURLPROTO_DICT...
d c X'00000200'
d CURLPROTO_FILE...
d c X'00000400'
d CURLPROTO_TFTP...
d c X'00000800'
d CURLPROTO_IMAP...
d c X'00001000'
d CURLPROTO_IMAPS...
d c X'00002000'
d CURLPROTO_POP3...
d c X'00004000'
d CURLPROTO_POP3S...
d c X'00008000'
d CURLPROTO_SMTP...
d c X'00010000'
d CURLPROTO_SMTPS...
d c X'00020000'
d CURLPROTO_RTSP...
d c X'00040000'
d CURLPROTO_RTMP...
d c X'00080000'
d CURLPROTO_RTMPT...
d c X'00100000'
d CURLPROTO_RTMPTE...
d c X'00200000'
d CURLPROTO_RTMPE...
d c X'00400000'
d CURLPROTO_RTMPS...
d c X'00800000'
d CURLPROTO_RTMPTS...
d c X'01000000'
d CURLPROTO_GOPHER...
d c X'02000000'
*
d CURLoption s 10i 0 based(######ptr######) Enum
d CURLOPT_FILE c 10001
d CURLOPT_WRITEDATA...
@@ -800,12 +520,12 @@
d c 10022
d CURLOPT_HTTPHEADER...
d c 10023
d CURLOPT_RTSPHEADER...
d c 10023
d CURLOPT_HTTPPOST...
d c 10024
d CURLOPT_SSLCERT...
d c 10025
d CURLOPT_SSLCERTPASSWD...
d c 10026
d CURLOPT_KEYPASSWD...
d c 10026
d CURLOPT_CRLF c 00027
@@ -938,7 +658,7 @@
d CURLOPT_SHARE c 10100
d CURLOPT_PROXYTYPE...
d c 00101
d CURLOPT_ACCEPT_ENCODING...
d CURLOPT_ENCODING...
d c 10102
d CURLOPT_PRIVATE...
d c 10103
@@ -1070,109 +790,9 @@
d c 10175
d CURLOPT_PROXYPASSWORD...
d c 10176
d CURLOPT_NOPROXY...
d c 10177
d CURLOPT_TFTP_BLKSIZE...
d c 00178
d CURLOPT_SOCKS5_GSSAPI_SERVICE...
d c 10179
d CURLOPT_SOCKS5_GSSAPI_NEC...
d c 00180
d CURLOPT_PROTOCOLS...
d c 00181
d CURLOPT_REDIR_PROTOCOLS...
d c 00182
d CURLOPT_SSH_KNOWNHOSTS...
d c 10183
d CURLOPT_SSH_KEYFUNCTION...
d c 20184
d CURLOPT_SSH_KEYDATA...
d c 10185
d CURLOPT_MAIL_FROM...
d c 10186
d CURLOPT_MAIL_RCPT...
d c 10187
d CURLOPT_FTP_USE_PRET...
d c 00188
d CURLOPT_RTSP_REQUEST...
d c 00189
d CURLOPT_RTSP_SESSION_ID...
d c 10190
d CURLOPT_RTSP_STREAM_URI...
d c 10191
d CURLOPT_RTSP_TRANSPORT...
d c 10192
d CURLOPT_RTSP_CLIENT_CSEQ...
d c 00193
d CURLOPT_RTSP_SERVER_CSEQ...
d c 00194
d CURLOPT_INTERLEAVEDATA...
d c 10195
d CURLOPT_INTERLEAVEFUNCTION...
d c 20196
d CURLOPT_WILDCARDMATCH...
d c 00197
d CURLOPT_CHUNK_BGN_FUNCTION...
d c 20198
d CURLOPT_CHUNK_END_FUNCTION...
d c 20199
d CURLOPT_FNMATCH_FUNCTION...
d c 20200
d CURLOPT_CHUNK_DATA...
d c 10201
d CURLOPT_FNMATCH_DATA...
d c 10202
d CURLOPT_RESOLVE...
d c 10203
d CURLOPT_TLSAUTH_USERNAME...
d c 10204
d CURLOPT_TLSAUTH_PASSWORD...
d c 10205
d CURLOPT_TLSAUTH_TYPE...
d c 10206
d CURLOPT_TRANSFER_ENCODING...
d c 00207
d CURLOPT_CLOSESOCKETFUNCTION...
d c 20208
d CURLOPT_CLOSESOCKETDATA...
d c 10209
d CURLOPT_GSSAPI_DELEGATION...
d c 00210
d CURLOPT_DNS_SERVERS...
d c 10211
d CURLOPT_ACCEPTTIMEOUT_MS...
d c 00212
d CURLOPT_TCP_KEEPALIVE...
d c 00213
d CURLOPT_TCP_KEEPIDLE...
d c 00214
d CURLOPT_TCP_KEEPINTVL...
d c 00215
d CURLOPT_SSL_OPTIONS...
d c 00216
d CURLOPT_MAIL_AUTH...
d c 10217
*
/if not defined(CURL_NO_OLDIES)
d CURLOPT_SSLKEYPASSWD...
d c 10026
d CURLOPT_SSLCERTPASSWD...
d c 10026
d CURLOPT_FTPLISTONLY...
d c 00048
d CURLOPT_FTPAPPEND...
d c 00050
d CURLOPT_KRB4LEVEL...
d c 10063
d CURLOPT_ENCODING...
d c 10102
d CURLOPT_SERVER_RESPONSE_TIMEOUT...
d c 00112
d CURLOPT_FTP_SSL...
d c 00119
d CURLOPT_POST301...
d c 00161
/endif
d c 00161 Obsolescent
*
d CURLFORMcode s 10i 0 based(######ptr######) Enum
d CURL_FORMADD_OK...
@@ -1303,22 +923,6 @@
d c X'00300021'
d CURLINFO_CERTINFO... CURLINFO_SLIST + 34
d c X'00400022'
d CURLINFO_CONDITION_UNMET... CURLINFO_LONG + 35
d c X'00200023'
d CURLINFO_RTSP_SESSION_ID... CURLINFO_STRING + 36
d c X'00100024'
d CURLINFO_RTSP_CLIENT_CSEQ... CURLINFO_LONG + 37
d c X'00200025'
d CURLINFO_RTSP_SERVER_CSEQ... CURLINFO_LONG + 38
d c X'00200026'
d CURLINFO_RTSP_CSEQ_RECV... CURLINFO_LONG + 39
d c X'00200027'
d CURLINFO_PRIMARY_PORT... CURLINFO_LONG + 40
d c X'00200028'
d CURLINFO_LOCAL_IP... CURLINFO_STRING + 41
d c X'00100029'
d CURLINFO_LOCAL_PORT... CURLINFO_LONG + 42
d c X'0020002A'
*
d CURLINFO_HTTP_CODE... Old ...RESPONSE_CODE
d c X'00200002'
@@ -1382,8 +986,6 @@
d c 3
d CURLSHE_NOMEM...
d c 4
d CURLSHE_NOT_BUILT_IN...
d c 5
*
d CURLSHoption...
d s 10i 0 based(######ptr######) Enum
@@ -1413,15 +1015,6 @@
d curlsocktype s 10i 0 based(######ptr######) Enum
d CURLSOCKTYPE_IPCXN...
d c 0
d CURLSOCKTYPE_ACCEPT...
d c 1
*
d CURL_SOCKOPT_OK...
d c 0
d CURL_SOCKOPT_ERROR...
d c 1
d CURL_SOCKOPT_ALREADY_CONNECTED...
d c 2
*
d CURLMcode s 10i 0 based(######ptr######) Enum
d CURLM_CALL_MULTI_PERFORM...
@@ -1460,36 +1053,6 @@
d c 10005
d CURLMOPT_MAXCONNECTS...
d c 00006
*
* Public API enums for RTSP requests.
*
d CURLRTSPREQ_NONE...
d c 0
d CURL_RTSPREQ_OPTIONS...
d c 1
d CURL_RTSPREQ_DESCRIBE...
d c 2
d CURL_RTSPREQ_ANNOUNCE...
d c 3
d CURL_RTSPREQ_SETUP...
d c 4
d CURL_RTSPREQ_PLAY...
d c 5
d CURL_RTSPREQ_PAUSE...
d c 6
d CURL_RTSPREQ_TEARDOWN...
d c 7
d CURL_RTSPREQ_GET_PARAMETER...
d c 8
d CURL_RTSPREQ_SET_PARAMETER...
d c 9
d CURL_RTSPREQ_RECORD...
d c 10
d CURL_RTSPREQ_RECEIVE...
d c 12
d CURL_RTSPREQ_LAST...
d c 13
*
* Renaming CURLMsg to CURL_Msg to avoid case-insensivity name clash.
*
@@ -1501,13 +1064,6 @@
d whatever * overlay(data) void *
d result overlay(data) like(CURLcode)
*
d curl_waitfd...
d ds based(######ptr######)
d qualified
d fd like(curl_socket_t)
d events 5i 0
d revents 5i 0
*
d curl_http_post...
d ds based(######ptr######)
d qualified
@@ -1533,24 +1089,9 @@
d family 10i 0
d socktype 10i 0
d protocol 10i 0
d addrlen 10u 0
d addrlen 10i 0 socklen_t
d addr 16 struct sockaddr
*
d curl_khkey ds based(######ptr######)
d qualified
d key * const char *
d len 10u 0
d keytype 10i 0
*
d CURLKHTYPE_UNKNOWN...
d c 0
d CURLKHTYPE_RSA1...
d c 1
d CURLKHTYPE_RSA...
d c 2
d CURLKHTYPE_DSS...
d c 3
*
d curl_forms ds based(######ptr######)
d qualified
d option like(CURLformoption)
@@ -1590,30 +1131,6 @@
d num_of_certs 10i 0
d certinfo * struct curl_slist **
*
d curl_fistrgs ds based(######ptr######)
d qualified
d time * char *
d perm * char *
d user * char *
d group * char *
d target * char *
*
d curl_fileinfo ds based(######ptr######)
d qualified
d filename * char *
d filetype like(curlfiletype)
d time 10i 0 time_t
d perm 10u 0
d uid 10i 0
d gid 10i 0
d size like(curl_off_t)
d hardlinks 10i 0
d strings likeds(curl_fistrgs)
d flags 10u 0
d b_data * char *
d b_size 10u 0 size_t
d b_used 10u 0 size_t
*
d curl_formget_callback...
d s * based(######ptr######) procptr
*
@@ -1669,21 +1186,6 @@
d s * based(######ptr######) procptr
*
d curl_opensocket_callback...
d s * based(######ptr######) procptr
*
d curl_sshkeycallback...
d s * based(######ptr######) procptr
*
d curl_chunk_bgn_callback...
d s * based(######ptr######) procptr
*
d curl_chunk_end_callback...
d s * based(######ptr######) procptr
*
d curl_fnmatch_callback...
d s * based(######ptr######) procptr
*
d curl_closesocket_callback...
d s * based(######ptr######) procptr
*
**************************************************************************
@@ -1953,15 +1455,6 @@
d exc_fd_set 65535 options(*varsize) fd_set
d max_fd 10i 0
*
d curl_multi_wait...
d pr extproc('curl_multi_wait')
d like(CURLMcode)
d multi_handle * value CURLM *
d extra_fds * value curl_waitfd *
d extra_nfds 10u 0 value
d timeout_ms 10i 0 value
d ret 10i 0 options(*omit)
*
d curl_multi_perform...
d pr extproc('curl_multi_perform')
d like(CURLMcode)
@@ -1,5 +1,6 @@
#!/bin/sh
# $Id: initscript.sh,v 1.6 2008-08-25 13:58:45 patrickm Exp $
case "${SCRIPTDIR}" in
/*) ;;
@@ -40,7 +41,7 @@ TGTCCSID='500' # Target CCSID of objects
DEBUG='*ALL' # Debug level
OPTIMIZE='10' # Optimisation level
OUTPUT='*NONE' # Compilation output option.
TGTRLS='V5R3M0' # Target OS release
TGTRLS='V5R2M0' # Target OS release
export TARGETLIB STATBNDDIR DYNBNDDIR SRVPGM TGTCCSID DEBUG OPTIMIZE OUTPUT
export TGTRLS
@@ -155,10 +156,9 @@ db2_name()
{
basename "${1}" |
tr 'a-z-' 'A-Z_' |
tr '[a-z-]' '[A-Z_]' |
sed -e 's/\..*//' \
-e 's/^CURL_*/C/' \
-e 's/^\(.\).*\(.........\)$/\1\2/'
-e 's/^\(..........\).*/\1/'
}
@@ -2,18 +2,17 @@
#
# Installation of the include files in the OS/400 library.
#
# $Id: make-include.sh,v 1.3 2008-08-25 13:58:45 patrickm Exp $
SCRIPTDIR=`dirname "${0}"`
. "${SCRIPTDIR}/initscript.sh"
cd "${TOPDIR}/include"
# Produce the curlbuild.h include file if not yet in distribution (CVS).
# Produce the curlbuild.h include file.
if action_needed curl/curlbuild.h
then if action_needed curl/curlbuild.h curl/curlbuild.h.dist
then cp -p curl/curlbuild.h.dist curl/curlbuild.h
fi
if action_needed curl/curlbuild.h curl/curlbuild.h.dist
then cp -p curl/curlbuild.h.dist curl/curlbuild.h
fi
@@ -34,15 +33,11 @@ fi
copy_hfile()
{
destfile="${1}"
srcfile="${2}"
shift
shift
sed -e '1i\
#pragma enum(int)\
' "${@}" -e '$a\
' -e '$a\
#pragma enum(pop)\
' < "${srcfile}" > "${destfile}"
' < "${2}" > "${1}"
}
# Copy the header files.
@@ -58,15 +53,3 @@ done
# Copy the ILE/RPG include file, setting-up version number.
versioned_copy "${SCRIPTDIR}/curl.inc.in" "${SRCPF}/CURL.INC.MBR"
# Duplicate file H as CURL to support more include path forms.
if action_needed "${LIBIFSNAME}/CURL.FILE"
then :
else system "DLTF FILE(${TARGETLIB}/CURL)"
fi
CMD="CRTDUPOBJ OBJ(H) FROMLIB(${TARGETLIB}) OBJTYPE(*FILE) TOLIB(*FROMLIB)"
CMD="${CMD} NEWOBJ(CURL) DATA(*YES)"
system "${CMD}"
@@ -2,6 +2,7 @@
#
# libcurl compilation script for the OS/400.
#
# $Id: make-lib.sh,v 1.4 2008-03-31 12:09:43 mmarek Exp $
SCRIPTDIR=`dirname "${0}"`
. "${SCRIPTDIR}/initscript.sh"
@@ -11,9 +12,8 @@ cd "${TOPDIR}/lib"
# Create and compile the identification source file.
echo '#pragma comment(user, "libcurl version '"${LIBCURL_VERSION}"'")' > os400.c
echo '#pragma comment(user, __DATE__)' >> 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(date)' >> os400.c
echo '#pragma comment(copyright, "Copyright (C) 1998-2008 Daniel Stenberg et al. OS/400 version by P. Monnerat")' >> os400.c
make_module OS400 os400.c
LINK= # No need to rebuild service program yet.
MODULES=
@@ -46,7 +46,9 @@ make_module OS400SYS "${SCRIPTDIR}/os400sys.c"
make_module CCSIDCURL "${SCRIPTDIR}/ccsidcurl.c"
for SRC in ${CSOURCES}
do MODULE=`db2_name "${SRC}"`
do MODULE=`basename "${SRC}" .c |
tr '[a-z]' '[A-Z]' |
sed -e 's/^\(..........\).*/\1/'`
make_module "${MODULE}" "${SRC}"
done
@@ -1,4 +1,5 @@
#!/bin/sh
#
# $Id: make-src.sh,v 1.1 2007-08-23 14:30:24 patrickm Exp $
#
# Not implemented yet on OS/400.
@@ -2,6 +2,7 @@
#
# tests compilation script for the OS/400.
#
# $Id: make-tests.sh,v 1.1 2007-08-23 14:30:24 patrickm Exp $
SCRIPTDIR=`dirname "${0}"`
@@ -16,7 +17,7 @@ cd "${TOPDIR}/tests"
cd libtest
# Get definitions from the Makefile.inc file.
# Get definitions from the Makefile.am file.
# The `sed' statement works as follows:
# _ Join \nl-separated lines.
# _ Retain only lines that begins with "identifier =".
@@ -34,12 +35,7 @@ eval "`sed -e ': begin' \
-e 's/[ ]*=[ ]*/=/' \
-e 's/=\\(.*[^ ]\\)[ ]*$/=\\"\\1\\"/' \
-e 's/\\$(\\([^)]*\\))/${\\1}/g' \
< Makefile.inc`"
# Special case: redefine chkhostname compilation parameters.
chkhostname_SOURCES=chkhostname.c
chkhostname_LDADD=curl_gethostname.o
< Makefile.am`"
# Compile all programs.
# The list is found in variable "noinst_PROGRAMS"
@@ -94,15 +90,7 @@ do DB2PGM=`db2_name "${PGM}"`
# Link program if needed.
if [ "${LINK}" ]
then PGMLDADD="`eval echo \"\\${${PGM}_LDADD}\"`"
for LDARG in ${PGMLDADD}
do case "${LDARG}" in
-*) ;; # Ignore non-module.
*) MODULES="${MODULES} "`db2_name "${LDARG}"`
;;
esac
done
MODULES="`echo \"${MODULES}\" |
then MODULES="`echo \"${MODULES}\" |
sed \"s/[^ ][^ ]*/${TARGETLIB}\/&/g\"`"
CMD="CRTPGM PGM(${TARGETLIB}/${DB2PGM})"
CMD="${CMD} ENTMOD(QADRT/QADRTMAIN2)"
@@ -2,6 +2,7 @@
#
# curl compilation script for the OS/400.
#
# $Id: makefile.sh,v 1.2 2007-08-24 15:56:59 patrickm Exp $
#
# This is a shell script since make is not a standard component of OS/400.
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
* Copyright (C) 1998 - 2011, Daniel Stenberg, <[email protected]>, et al.
* Copyright (C) 1998 - 2008, Daniel Stenberg, <[email protected]>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -18,13 +18,13 @@
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
* $Id: os400sys.c,v 1.6 2008-09-24 12:22:17 yangtse Exp $
*
***************************************************************************/
/* OS/400 additional support. */
#include "curlbuild.h"
#include "config-os400.h" /* Not curl_setup.h: we only need some defines. */
#include "config-os400.h" /* Not setup.h: we only need some defines. */
#include <sys/types.h>
#include <sys/socket.h>
@@ -237,9 +237,9 @@ buffer_undef(localkey_t key, long size)
int
Curl_getnameinfo_a(const struct sockaddr * sa, curl_socklen_t salen,
char * nodename, curl_socklen_t nodenamelen,
char * servname, curl_socklen_t servnamelen,
Curl_getnameinfo_a(const struct sockaddr * sa, socklen_t salen,
char * nodename, socklen_t nodenamelen,
char * servname, socklen_t servnamelen,
int flags)
{
@@ -863,7 +863,6 @@ Curl_ldap_get_dn_a(void * ld, LDAPMessage * entry)
return cp2;
QadrtConvertE2A(cp2, cp, i, i);
cp2[i] = '\0';
/* No way to allocate a buffer here, because it will be released by
ldap_memfree() and ldap_memalloc() does not exist. The solution is to
@@ -895,7 +894,6 @@ Curl_ldap_first_attribute_a(void * ld,
return cp2;
QadrtConvertE2A(cp2, cp, i, i);
cp2[i] = '\0';
/* No way to allocate a buffer here, because it will be released by
ldap_memfree() and ldap_memalloc() does not exist. The solution is to
@@ -927,7 +925,6 @@ Curl_ldap_next_attribute_a(void * ld,
return cp2;
QadrtConvertE2A(cp2, cp, i, i);
cp2[i] = '\0';
/* No way to allocate a buffer here, because it will be released by
ldap_memfree() and ldap_memalloc() does not exist. The solution is to
@@ -18,6 +18,7 @@
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
* $Id: os400sys.h,v 1.2 2008-01-16 16:04:47 patrickm Exp $
*
***************************************************************************/