Permalink
Browse files

7.3 commit

  • Loading branch information...
1 parent 221f1c2 commit 13962adcb55a676b0b47925680b2e17b3e4815f0 @bagder bagder committed Sep 28, 2000
Showing with 228 additions and 133 deletions.
  1. +13 −1 CHANGES
  2. +3 −0 acconfig.h
  3. +18 −0 config.h.in
  4. +1 −1 configure.in
  5. +1 −0 docs/FAQ
  6. +4 −1 docs/curl_easy_init.3
  7. +1 −1 include/curl/curl.h
  8. +3 −2 lib/Makefile.am
  9. +3 −3 lib/Makefile.in
  10. +1 −1 lib/http.c
  11. +2 −1 lib/url.c
  12. +177 −121 src/hugehelp.c
  13. +1 −1 src/version.h
View
14 CHANGES
@@ -8,6 +8,18 @@
Version 7.3
+Daniel (28 September 2000)
+- Removed the base64_krb.[ch] files. They've now replaced the former
+ base64.[ch] files.
+
+Daniel (26 September 2000)
+- Updated some docs.
+
+- I changed the OpenSSL fix to work with older versions as well. The posted
+ patch was only working with 0.9.6 and no older ones.
+
+Version 7.3-pre8
+
Daniel (25 September 2000)
- Erdmut Pfeifer informed us that curl didn't build with OpenSSL 0.9.6 and
showed us what needed to get patched in order to make it build properly
@@ -33,7 +45,7 @@ Daniel (21 September 2000)
Daniel (20 September 2000)
- Richard Prescott solved another name lookup buffer size problem. I took this
opportunity to rewrite the GetHost() function. With these large buffer
- sizes, I think keeping them as local arrays quickly turn ugly. I know use
+ sizes, I think keeping them as local arrays quickly turn ugly. I now use
malloc() to get the buffer memory. Thanks to this, I now can realloc() to a
large buffer in case of demand (errno == ERANGE) in case a solution like
that would become necessary. I still want to avoid that kind of nastiness.
View
@@ -33,3 +33,6 @@
/* Define if you need the _REENTRANT define for some functions */
#undef NEED_REENTRANT
+
+/* Define if you have the Kerberos4 libraries (including -ldes) */
+#undef KRB4
View
@@ -49,6 +49,9 @@
/* Define if you need the _REENTRANT define for some functions */
#undef NEED_REENTRANT
+/* Define if you have the Kerberos4 libraries (including -ldes) */
+#undef KRB4
+
/* The number of bytes in a long double. */
#undef SIZEOF_LONG_DOUBLE
@@ -94,6 +97,9 @@
/* Define if you have the inet_ntoa_r function. */
#undef HAVE_INET_NTOA_R
+/* Define if you have the krb_get_our_ip_for_realm function. */
+#undef HAVE_KRB_GET_OUR_IP_FOR_REALM
+
/* Define if you have the localtime_r function. */
#undef HAVE_LOCALTIME_R
@@ -124,6 +130,9 @@
/* Define if you have the stricmp function. */
#undef HAVE_STRICMP
+/* Define if you have the strlcpy function. */
+#undef HAVE_STRLCPY
+
/* Define if you have the strstr function. */
#undef HAVE_STRSTR
@@ -145,6 +154,9 @@
/* Define if you have the <crypto.h> header file. */
#undef HAVE_CRYPTO_H
+/* Define if you have the <des.h> header file. */
+#undef HAVE_DES_H
+
/* Define if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
@@ -160,6 +172,9 @@
/* Define if you have the <io.h> header file. */
#undef HAVE_IO_H
+/* Define if you have the <krb.h> header file. */
+#undef HAVE_KRB_H
+
/* Define if you have the <malloc.h> header file. */
#undef HAVE_MALLOC_H
@@ -256,6 +271,9 @@
/* Define if you have the nsl library (-lnsl). */
#undef HAVE_LIBNSL
+/* Define if you have the resolv library (-lresolv). */
+#undef HAVE_LIBRESOLV
+
/* Define if you have the resolve library (-lresolve). */
#undef HAVE_LIBRESOLVE
View
@@ -2,7 +2,7 @@ dnl $Id$
dnl Process this file with autoconf to produce a configure script.
AC_INIT(lib/urldata.h)
AM_CONFIG_HEADER(config.h src/config.h)
-AM_INIT_AUTOMAKE(curl,"7.3-pre8")
+AM_INIT_AUTOMAKE(curl,"7.3")
AM_PROG_LIBTOOL
dnl
View
@@ -141,6 +141,7 @@ FAQ
Solaris (native cc compiler)
HPUX (native cc compiler)
SGI IRIX (native cc compiler)
+ SCO UNIX (native cc compiler)
When configuring curl, I specify --with-ssl. OpenSSL is installed in
/usr/local/ssl Configure reports SSL in /usr/local/ssl, but fails to find
View
@@ -2,7 +2,7 @@
.\" nroff -man [file]
.\" Written by daniel@haxx.se
.\"
-.TH curl_easy_init 3 "22 May 2000" "Curl 7.0" "libcurl Manual"
+.TH curl_easy_init 3 "26 September 2000" "Curl 7.0" "libcurl Manual"
.SH NAME
curl_easy_init - Start a libcurl "easy" session
.SH SYNOPSIS
@@ -16,6 +16,9 @@ that you shall use as input to the other easy-functions. The init calls
intializes curl and this call MUST have a corresponding call to
.I curl_easy_cleanup
when the operation is complete.
+
+On win32 systems, you need to init the winsock stuff manually, libcurl will
+not do that for you. WSAStartup() and WSACleanup() should be used accordingly.
.SH RETURN VALUE
If this function returns NULL, something went wrong and you cannot use the
other curl functions.
View
@@ -442,7 +442,7 @@ char *curl_getenv(char *variable);
char *curl_version(void);
/* This is the version number */
-#define LIBCURL_VERSION "7.3-pre6"
+#define LIBCURL_VERSION "7.3"
#define LIBCURL_VERSION_NUM 0x070300
/* linked-list structure for the CURLOPT_QUOTE option */
View
@@ -2,7 +2,7 @@
# $Id$
#
-AUTOMAKE_OPTIONS = foreign no-dependencies
+AUTOMAKE_OPTIONS = foreign
lib_LTLIBRARIES = libcurl.la
@@ -23,7 +23,8 @@ download.c getdate.h ldap.c ssluse.c version.c \
download.h getenv.c ldap.h ssluse.h \
escape.c getenv.h mprintf.c telnet.c \
escape.h getpass.c netrc.c telnet.h \
-writeout.c writeout.h highlevel.c strequal.c strequal.h easy.c
+writeout.c writeout.h highlevel.c strequal.c strequal.h easy.c \
+security.h security.c krb4.c
# Say $(srcdir), so GNU make does not report an ambiguity with the .y.c rule.
$(srcdir)/getdate.c: getdate.y
View
@@ -77,7 +77,7 @@ RANLIB = @RANLIB@
VERSION = @VERSION@
YACC = @YACC@
-AUTOMAKE_OPTIONS = foreign no-dependencies
+AUTOMAKE_OPTIONS = foreign
lib_LTLIBRARIES = libcurl.la
@@ -86,7 +86,7 @@ lib_LTLIBRARIES = libcurl.la
INCLUDES = -I$(top_srcdir)/include
-libcurl_la_SOURCES = arpa_telnet.h file.c getpass.h netrc.h timeval.c base64.c file.h hostip.c progress.c timeval.h base64.h formdata.c hostip.h progress.h cookie.c formdata.h http.c sendf.c cookie.h ftp.c http.h sendf.h url.c dict.c ftp.h if2ip.c speedcheck.c url.h dict.h getdate.c if2ip.h speedcheck.h urldata.h download.c getdate.h ldap.c ssluse.c version.c download.h getenv.c ldap.h ssluse.h escape.c getenv.h mprintf.c telnet.c escape.h getpass.c netrc.c telnet.h writeout.c writeout.h highlevel.c strequal.c strequal.h easy.c
+libcurl_la_SOURCES = arpa_telnet.h file.c getpass.h netrc.h timeval.c base64.c file.h hostip.c progress.c timeval.h base64.h formdata.c hostip.h progress.h cookie.c formdata.h http.c sendf.c cookie.h ftp.c http.h sendf.h url.c dict.c ftp.h if2ip.c speedcheck.c url.h dict.h getdate.c if2ip.h speedcheck.h urldata.h download.c getdate.h ldap.c ssluse.c version.c download.h getenv.c ldap.h ssluse.h escape.c getenv.h mprintf.c telnet.c escape.h getpass.c netrc.c telnet.h writeout.c writeout.h highlevel.c strequal.c strequal.h easy.c security.h security.c krb4.c
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h ../src/config.h
@@ -104,7 +104,7 @@ libcurl_la_OBJECTS = file.lo timeval.lo base64.lo hostip.lo progress.lo \
formdata.lo cookie.lo http.lo sendf.lo ftp.lo url.lo dict.lo if2ip.lo \
speedcheck.lo getdate.lo download.lo ldap.lo ssluse.lo version.lo \
getenv.lo escape.lo mprintf.lo telnet.lo getpass.lo netrc.lo \
-writeout.lo highlevel.lo strequal.lo easy.lo
+writeout.lo highlevel.lo strequal.lo easy.lo security.lo krb4.lo
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
View
@@ -295,7 +295,7 @@ CURLcode http(struct connectdata *conn)
!data->auth_host ||
strequal(data->auth_host, data->hostname)) {
sprintf(data->buffer, "%s:%s", data->user, data->passwd);
- if(base64Encode(data->buffer, 0, /* size zero makes it do strlen() */
+ if(base64_encode(data->buffer, strlen(data->buffer),
&authorization) >= 0) {
data->ptr_userpwd = maprintf( "Authorization: Basic %s\015\012",
authorization);
View
@@ -1392,7 +1392,8 @@ CURLcode curl_connect(CURL *curl, CURLconnect **in_connect)
if(data->bits.proxy_user_passwd) {
char *authorization;
sprintf(data->buffer, "%s:%s", data->proxyuser, data->proxypasswd);
- if(base64Encode(data->buffer, 0, &authorization) >= 0) {
+ if(base64_encode(data->buffer, strlen(data->buffer),
+ &authorization) >= 0) {
data->ptr_proxyuserpwd =
maprintf("Proxy-authorization: Basic %s\015\012", authorization);
free(authorization);
Oops, something went wrong.

0 comments on commit 13962ad

Please sign in to comment.