mirror of https://github.com/moparisthebest/curl
Jrt Hartroth's updates
This commit is contained in:
parent
39b1801c63
commit
c35238e0a3
|
@ -9,7 +9,7 @@
|
||||||
CC = gcc
|
CC = gcc
|
||||||
AR = ar
|
AR = ar
|
||||||
RANLIB = ranlib
|
RANLIB = ranlib
|
||||||
OPENSSL_PATH = ../../openssl-0.9.4
|
OPENSSL_PATH = ../../openssl-0.9.5a
|
||||||
|
|
||||||
########################################################
|
########################################################
|
||||||
## Nothing more to do below this line!
|
## Nothing more to do below this line!
|
||||||
|
@ -31,12 +31,14 @@ urldata.h formdata.c hostip.h netrc.h stdcheaders.h formdata.h \
|
||||||
if2ip.c progress.c sendf.c sendf.h speedcheck.c speedcheck.h \
|
if2ip.c progress.c sendf.c sendf.h speedcheck.c speedcheck.h \
|
||||||
ftp.c ftp.h getpass.c getpass.h version.c timeval.c timeval.h cookie.c \
|
ftp.c ftp.h getpass.c getpass.h version.c timeval.c timeval.h cookie.c \
|
||||||
cookie.h escape.c escape.h getdate.c getdate.h dict.h dict.c http.c \
|
cookie.h escape.c escape.h getdate.c getdate.h dict.h dict.c http.c \
|
||||||
http.h telnet.c telnet.h file.c file.h ldap.c ldap.h writeout.c writeout.h
|
http.h telnet.c telnet.h file.c file.h ldap.c ldap.h writeout.c writeout.h \
|
||||||
|
highlevel.c strequal.c strequal.h easy.c
|
||||||
|
|
||||||
libcurl_a_OBJECTS = base64.o getenv.o mprintf.o url.o download.o \
|
libcurl_a_OBJECTS = base64.o getenv.o mprintf.o url.o download.o \
|
||||||
getpass.o ssluse.o hostip.o netrc.o formdata.o if2ip.o progress.o \
|
getpass.o ssluse.o hostip.o netrc.o formdata.o if2ip.o progress.o \
|
||||||
sendf.o speedcheck.o ftp.o getpass.o version.o timeval.o \
|
sendf.o speedcheck.o ftp.o getpass.o version.o timeval.o \
|
||||||
cookie.o escape.o getdate.o dict.o http.o telnet.o file.o ldap.o writeout.o
|
cookie.o escape.o getdate.o dict.o http.o telnet.o file.o ldap.o writeout.o \
|
||||||
|
highlevel.o strequal.o easy.o
|
||||||
|
|
||||||
LIBRARIES = $(libcurl_a_LIBRARIES)
|
LIBRARIES = $(libcurl_a_LIBRARIES)
|
||||||
SOURCES = $(libcurl_a_SOURCES)
|
SOURCES = $(libcurl_a_SOURCES)
|
||||||
|
@ -63,5 +65,6 @@ clean:
|
||||||
-@erase $(libcurl_a_OBJECTS)
|
-@erase $(libcurl_a_OBJECTS)
|
||||||
|
|
||||||
distrib: clean
|
distrib: clean
|
||||||
|
|
||||||
-@erase $(libcurl_a_LIBRARIES)
|
-@erase $(libcurl_a_LIBRARIES)
|
||||||
|
|
||||||
|
|
|
@ -107,7 +107,7 @@ CURL *curl_easy_init(void)
|
||||||
if(res != CURLE_OK)
|
if(res != CURLE_OK)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
data->interface = CURLI_EASY; /* mark it as an easy one */
|
data->interf = CURLI_EASY; /* mark it as an easy one */
|
||||||
return data;
|
return data;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -249,7 +249,7 @@ CURLcode curl_open(CURL **curl, char *url)
|
||||||
if(data) {
|
if(data) {
|
||||||
memset(data, 0, sizeof(struct UrlData));
|
memset(data, 0, sizeof(struct UrlData));
|
||||||
data->handle = STRUCT_OPEN;
|
data->handle = STRUCT_OPEN;
|
||||||
data->interface = CURLI_NORMAL; /* normal interface by default */
|
data->interf = CURLI_NORMAL; /* normal interface by default */
|
||||||
|
|
||||||
/* We do some initial setup here, all those fields that can't be just 0 */
|
/* We do some initial setup here, all those fields that can't be just 0 */
|
||||||
|
|
||||||
|
|
|
@ -306,7 +306,7 @@ typedef enum {
|
||||||
|
|
||||||
struct UrlData {
|
struct UrlData {
|
||||||
Handle handle; /* struct identifier */
|
Handle handle; /* struct identifier */
|
||||||
CurlInterface interface;
|
CurlInterface interf; /* created by WHAT interface? */
|
||||||
|
|
||||||
/*************** Global - specific items ************/
|
/*************** Global - specific items ************/
|
||||||
FILE *err; /* the stderr writes goes here */
|
FILE *err; /* the stderr writes goes here */
|
||||||
|
|
Loading…
Reference in New Issue