summaryrefslogtreecommitdiff
path: root/neon/neon.patch
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2009-07-07 07:00:55 +0000
committerVladimir Glazounov <vg@openoffice.org>2009-07-07 07:00:55 +0000
commitb46c644225b90f5f6edf5f8144210dc817579960 (patch)
treebe8e6390c1c7691e7da86515f8ddb6ca7eff9ca9 /neon/neon.patch
parentbca6cc8cf13039699a734dbe498de67c35499f6f (diff)
CWS-TOOLING: integrate CWS tkr22_DEV300
2009-06-10 16:22:32 +0200 tkr r272826 : #100878# ucpdav1 lib has now the patch flag 2009-06-08 14:38:33 +0200 tkr r272731 : CWS-TOOLING: rebase CWS tkr22 to branches/OOO310@272261 (milestone: OOO310:m12) 2009-06-08 13:10:16 +0200 tkr r272728 : #100878# add Wspiapi.h to ne_sockets to prevent win2000 crashes
Diffstat (limited to 'neon/neon.patch')
-rw-r--r--neon/neon.patch1580
1 files changed, 795 insertions, 785 deletions
diff --git a/neon/neon.patch b/neon/neon.patch
index bdc296483534..b62a64ab23f4 100644
--- a/neon/neon.patch
+++ b/neon/neon.patch
@@ -1,785 +1,795 @@
---- misc/neon-0.28.2/src/config.h 2008-08-25 14:36:05.062500000 +0200
-+++ misc/build/neon-0.28.2/src/config.h 2008-08-25 14:32:17.656250000 +0200
-@@ -1 +1,479 @@
--dummy
-+
-+/* Define to specific EGD socket path */
-+/* #undef EGD_PATH */
-+
-+/* Define if EGD should be supported */
-+/* #undef ENABLE_EGD */
-+
-+/* Define if GSS_C_NT_HOSTBASED_SERVICE is not defined otherwise */
-+/* #undef GSS_C_NT_HOSTBASED_SERVICE */
-+
-+/* Define to 1 if you have the <arpa/inet.h> header file. */
-+#ifdef UNX
-+#define HAVE_ARPA_INET_H 1
-+#endif
-+
-+/* Define to 1 if you have the `bind_textdomain_codeset' function. */
-+/* #undef HAVE_BIND_TEXTDOMAIN_CODESET 1 */
-+
-+/* Define to 1 if you have the declaration of `h_errno', and to 0 if you
-+ don't. */
-+#ifdef WIN32
-+#define HAVE_DECL_H_ERRNO 1
-+#endif
-+
-+/* Define to 1 if you have the declaration of `stpcpy', and to 0 if you don't.
-+ */
-+#ifdef LINUX
-+#define HAVE_DECL_STPCPY 1
-+#endif
-+
-+/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you
-+ don't. */
-+#ifdef LINUX
-+#define HAVE_DECL_STRERROR_R 1
-+#endif
-+
-+/* Define to 1 if you have the <dlfcn.h> header file. */
-+#ifdef UNX
-+#define HAVE_DLFCN_H 1
-+#endif
-+
-+/* Define to 1 if you have the <errno.h> header file. */
-+#define HAVE_ERRNO_H 1
-+
-+/* Define if you have expat */
-+/* #undef HAVE_EXPAT */
-+
-+/* Define to 1 if you have the `fstat64' function. */
-+#define HAVE_FSTAT64
-+
-+/* Define to 1 if you have the `gai_strerror' function. */
-+#define HAVE_GAI_STRERROR 1
-+
-+/* Define if GnuTLS support is enabled */
-+/* #undef HAVE_GNUTLS */
-+
-+/* Define to 1 if you have the `gnutls_session_get_data2' function. */
-+/* #undef HAVE_GNUTLS_SESSION_GET_DATA2 */
-+
-+/* Define if GSSAPI support is enabled */
-+/* #undef HAVE_GSSAPI */
-+
-+/* Define to 1 if you have the <gssapi/gssapi_generic.h> header file. */
-+/* #undef HAVE_GSSAPI_GSSAPI_GENERIC_H */
-+
-+/* Define to 1 if you have the <gssapi/gssapi.h> header file. */
-+/* #undef HAVE_GSSAPI_GSSAPI_H */
-+
-+/* Define to 1 if you have the <gssapi.h> header file. */
-+/* #undef HAVE_GSSAPI_H */
-+
-+/* Define to 1 if you have the `gss_init_sec_context' function. */
-+/* #undef HAVE_GSS_INIT_SEC_CONTEXT */
-+
-+/* Define to 1 if you have the `hstrerror' function. */
-+/* #undef HAVE_HSTRERROR */
-+
-+/* Define to 1 if you have the `inet_ntop' function. */
-+#ifdef UNX
-+#define HAVE_INET_NTOP 1
-+#endif
-+
-+/* Define to 1 if you have the <inttypes.h> header file. */
-+#ifdef UNX
-+#define HAVE_INTTYPES_H 1
-+#endif
-+
-+/* Define to 1 if you have the `isatty' function. */
-+#define HAVE_ISATTY 1
-+
-+/* Define to 1 if you have the <libintl.h> header file. */
-+/* #undef HAVE_LIBINTL_H */
-+
-+/* Define if you have libxml */
-+#define HAVE_LIBXML 1
-+
-+/* Define to 1 if you have the <libxml/parser.h> header file. */
-+#define HAVE_LIBXML_PARSER_H 1
-+
-+/* Define to 1 if you have the <libxml/xmlversion.h> header file. */
-+#define HAVE_LIBXML_XMLVERSION_H 1
-+
-+/* Define to 1 if you have the <limits.h> header file. */
-+#define HAVE_LIMITS_H 1
-+
-+/* Define to 1 if you have the <locale.h> header file. */
-+#define HAVE_LOCALE_H 1
-+
-+/* Define to 1 if you have the `lseek64' function. */
-+#define HAVE_LSEEK64 1
-+
-+/* Define to 1 if you have the <memory.h> header file. */
-+#define HAVE_MEMORY_H 1
-+
-+/* Define to 1 if you have the <netdb.h> header file. */
-+#ifdef UNX
-+#define HAVE_NETDB_H 1
-+#endif
-+
-+/* Define to 1 if you have the <netinet/in.h> header file. */
-+#ifdef UNX
-+#define HAVE_NETINET_IN_H 1
-+#endif
-+
-+/* Define to 1 if you have the <netinet/tcp.h> header file. */
-+#ifdef UNX
-+#define HAVE_NETINET_TCP_H 1
-+#endif
-+
-+/* Define if OpenSSL support is enabled */
-+/* #undef HAVE_OPENSSL */
-+#define HAVE_OPENSSL
-+/* Define to 1 if you have the <openssl/opensslv.h> header file. */
-+/* #undef HAVE_OPENSSL_OPENSSLV_H */
-+#define HAVE_OPENSSL_OPENSSLV_H 1
-+/* Define to 1 if you have the <openssl/ssl.h> header file. */
-+/* #undef HAVE_OPENSSL_SSL_H */
-+#define HAVE_OPENSSL_SSL_H 1
-+/* Define to 1 if you have the `pipe' function. */
-+#define HAVE_PIPE 1
-+
-+/* Define to 1 if you have the `poll' function. */
-+#define HAVE_POLL 1
-+
-+/* Define to 1 if you have the `pthread_mutex_init' function. */
-+/* #undef HAVE_PTHREAD_MUTEX_INIT */
-+
-+/* Define to 1 if you have the `pthread_mutex_lock' function. */
-+/* #undef HAVE_PTHREAD_MUTEX_LOCK */
-+
-+/* Define to 1 if you have the `setlocale' function. */
-+#define HAVE_SETLOCALE 1
-+
-+/* Define to 1 if you have the `setsockopt' function. */
-+#if defined (LINUX) || defined (WIN32)
-+#define HAVE_SETSOCKOPT 1
-+#endif
-+
-+/* Define to 1 if you have the `setvbuf' function. */
-+#define HAVE_SETVBUF 1
-+
-+/* Define to 1 if you have the `shutdown' function. */
-+#ifdef LINUX
-+#define HAVE_SHUTDOWN 1
-+#endif
-+
-+/* Define to 1 if you have the `signal' function. */
-+#define HAVE_SIGNAL 1
-+
-+/* Define to 1 if you have the <signal.h> header file. */
-+#define HAVE_SIGNAL_H 1
-+
-+/* Define to 1 if you have the `snprintf' function. */
-+#ifdef UNX
-+#define HAVE_SNPRINTF 1
-+#endif
-+
-+#ifdef WIN32
-+#define snprintf _snprintf
-+#endif
-+
-+/* Define to 1 if you have the <socks.h> header file. */
-+/* #undef HAVE_SOCKS_H */
-+
-+/* Define to 1 if you have the <stdarg.h> header file. */
-+#define HAVE_STDARG_H 1
-+
-+/* Define to 1 if you have the <stdint.h> header file. */
-+#define HAVE_STDINT_H 1
-+
-+/* Define to 1 if you have the <stdlib.h> header file. */
-+#define HAVE_STDLIB_H 1
-+
-+/* Define to 1 if you have the `stpcpy' function. */
-+#ifdef LINUX
-+#define HAVE_STPCPY 1
-+#endif
-+
-+/* Define to 1 if you have the `strcasecmp' function. */
-+#ifdef UNX
-+#define HAVE_STRCASECMP 1
-+#endif
-+
-+#ifdef WIN32
-+#define strcasecmp strcmpi
-+#endif
-+
-+/* Define to 1 if you have the `strerror_r' function. */
-+#ifdef LINUX
-+#define HAVE_STRERROR_R 1
-+#endif
-+
-+/* Define to 1 if you have the <strings.h> header file. */
-+#ifdef UNX
-+#define HAVE_STRINGS_H 1
-+#endif
-+
-+/* Define to 1 if you have the <string.h> header file. */
-+#define HAVE_STRING_H 1
-+
-+/* Define to 1 if you have the `strtoll' function. */
-+#define HAVE_STRTOLL 1
-+
-+/* Define to 1 if you have the `strtoq' function. */
-+/* #undef HAVE_STRTOQ */
-+
-+/* Define to 1 if `tm_gmtoff' is member of `struct tm'. */
-+#ifdef LINUX
-+#define HAVE_STRUCT_TM_TM_GMTOFF 1
-+#endif
-+
-+/* Define to 1 if `__tm_gmtoff' is member of `struct tm'. */
-+/* #undef HAVE_STRUCT_TM___TM_GMTOFF */
-+
-+/* Define to 1 if you have the <sys/limits.h> header file. */
-+/* #undef HAVE_SYS_LIMITS_H */
-+
-+/* Define to 1 if you have the <sys/poll.h> header file. */
-+#ifdef UNX
-+#define HAVE_SYS_POLL_H 1
-+#endif
-+
-+/* Define to 1 if you have the <sys/select.h> header file. */
-+#ifdef UNX
-+#define HAVE_SYS_SELECT_H 1
-+#endif
-+
-+/* Define to 1 if you have the <sys/socket.h> header file. */
-+#ifdef UNX
-+#define HAVE_SYS_SOCKET_H 1
-+#endif
-+
-+/* Define to 1 if you have the <sys/stat.h> header file. */
-+#define HAVE_SYS_STAT_H 1
-+
-+/* Define to 1 if you have the <sys/time.h> header file. */
-+#ifdef UNX
-+#define HAVE_SYS_TIME_H 1
-+#endif
-+
-+/* Define to 1 if you have the <sys/types.h> header file. */
-+#define HAVE_SYS_TYPES_H 1
-+
-+/* Define if the timezone global is available */
-+#ifndef MACOSX
-+#define HAVE_TIMEZONE 1
-+#endif
-+
-+/* Use trio printf replacement library */
-+/* #undef HAVE_TRIO */
-+
-+/* Define to 1 if you have the <trio.h> header file. */
-+/* #undef HAVE_TRIO_H */
-+
-+/* Define to 1 if you have the <unistd.h> header file. */
-+#ifdef UNX
-+#define HAVE_UNISTD_H 1
-+#endif
-+
-+/* Define to 1 if you have the `usleep' function. */
-+#ifdef UNX
-+#define HAVE_USLEEP 1
-+#endif
-+
-+/* Define to 1 if you have the `vsnprintf' function. */
-+#if defined( UNX ) || (defined(_MSC_VER) && (_MSC_VER > 1400))
-+#define HAVE_VSNPRINTF 1
-+#endif
-+
-+#ifdef WIN32
-+#if (defined(_MSC_VER) && (_MSC_VER < 1500)) || defined(__MINGW32__)
-+#define vsnprintf _vsnprintf
-+#endif
-+#endif
-+
-+/* Define to be location of localedir */
-+/* #undef LOCALEDIR */
-+
-+/* Defined when neon is built as a library */
-+#define NEON_IS_LIBRARY 1
-+
-+/* Define to be the neon version string */
-+#define NEON_VERSION "0.26.3"
-+
-+/* Define to enable debugging */
-+/* #undef NE_DEBUGGING */
-+
-+/* Define to be printf format string for off64_t */
-+#define NE_FMT_OFF64_T "lld"
-+
-+/* Define to be printf format string for off_t */
-+#define NE_FMT_OFF_T "ld"
-+
-+/* Define to be printf format string for size_t */
-+#define NE_FMT_SIZE_T "u"
-+
-+/* Define to be printf format string for ssize_t */
-+#define NE_FMT_SSIZE_T "d"
-+
-+/* Define to be printf format string for time_t */
-+#define NE_FMT_TIME_T "ld"
-+
-+/* Defined if DAV is supported */
-+#define NE_HAVE_DAV 1
-+
-+/* Defined if I18N is supported */
-+/* #undef NE_HAVE_I18N 1 */
-+
-+/* Defined if IPV6 is supported */
-+#define NE_HAVE_IPV6 1
-+
-+/* Defined if LFS is supported */
-+#define NE_HAVE_LFS 1
-+
-+/* Defined if SOCKS is supported */
-+/* #undef NE_HAVE_SOCKS */
-+
-+/* Defined if SSL is supported */
-+/* #undef NE_HAVE_SSL */
-+#define NE_HAVE_SSL
-+/* Defined if TS_SSL is supported */
-+/* #undef NE_HAVE_TS_SSL */
-+
-+/* Defined if ZLIB is supported */
-+/* #undef NE_HAVE_ZLIB */
-+
-+/* Define to be filename of an SSL CA root bundle */
-+/* #undef NE_SSL_CA_BUNDLE */
-+
-+/* Define if poll() should be used */
-+#ifdef UNX
-+#define NE_USE_POLL 1
-+#endif
-+
-+/* Define to be neon library major version */
-+#define NE_VERSION_MAJOR (0)
-+
-+/* Define to be neon library minor version */
-+#define NE_VERSION_MINOR (26)
-+
-+/* Define to be neon library patch version */
-+#define NE_VERSION_PATCH (3)
-+
-+/* Define to the address where bug reports for this package should be sent. */
-+#define PACKAGE_BUGREPORT "neon@webdav.org"
-+
-+/* Define to the full name of this package. */
-+#define PACKAGE_NAME "neon"
-+
-+/* Define to the full name and version of this package. */
-+#define PACKAGE_STRING "neon 0.26.3"
-+
-+/* Define to the one symbol short name of this package. */
-+#define PACKAGE_TARNAME "neon"
-+
-+/* Define to the version of this package. */
-+#define PACKAGE_VERSION "0.26.3"
-+
-+/* The size of a `int', as computed by sizeof. */
-+#define SIZEOF_INT 4
-+
-+/* The size of a `long', as computed by sizeof. */
-+#define SIZEOF_LONG 4
-+
-+/* The size of a `long long', as computed by sizeof. */
-+#define SIZEOF_LONG_LONG 8
-+
-+/* The size of a `off64_t', as computed by sizeof. */
-+#define SIZEOF_OFF64_T 8
-+
-+/* The size of a `off_t', as computed by sizeof. */
-+#define SIZEOF_OFF_T 4
-+
-+/* The size of a `size_t', as computed by sizeof. */
-+#define SIZEOF_SIZE_T 4
-+
-+/* The size of a `ssize_t', as computed by sizeof. */
-+#define SIZEOF_SSIZE_T 4
-+
-+/* The size of a `time_t', as computed by sizeof. */
-+#define SIZEOF_TIME_T 4
-+
-+/* Define to 1 if you have the ANSI C header files. */
-+#ifdef SOLARIS
-+#define STDC_HEADERS 1
-+#endif
-+
-+/* Define to 1 if strerror_r returns char *. */
-+#ifdef LINUX
-+#define STRERROR_R_CHAR_P 1
-+#endif
-+
-+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-+#define TIME_WITH_SYS_TIME 1
-+
-+/* Define if getaddrinfo supports AI_ADDRCONFIG */
-+/* #undef USE_GAI_ADDRCONFIG */
-+
-+/* Define if getaddrinfo() should be used */
-+#define USE_GETADDRINFO 1
-+
-+/* Define to 1 if your processor stores words with the most significant byte
-+ first (like Motorola and SPARC, unlike Intel and VAX). */
-+#if defined (SOLARIS) && defined (SPARC)
-+#define WORDS_BIGENDIAN 1
-+#endif
-+
-+/* Always defined to enable GNU extensions */
-+#define _GNU_SOURCE 1
-+
-+/* Define to empty if `const' does not conform to ANSI C. */
-+/* #undef const */
-+
-+/* Define if in_addr_t is not available */
-+/* #undef in_addr_t */
-+
-+/* Define to `__inline__' or `__inline' if that's what the C compiler
-+ calls it, or to nothing if 'inline' is not supported under any name. */
-+#ifndef __cplusplus
-+#if defined (SOLARIS) && defined (__SUNPRO_C)
-+#define inline
-+#endif
-+#endif
-+
-+/* Define to `long' if <sys/types.h> does not define. */
-+/* #undef off_t */
-+
-+/* Define to `int' if <sys/types.h> does not define. */
-+/* #undef pid_t */
-+
-+/* Define to `unsigned' if <sys/types.h> does not define. */
-+/* #undef size_t */
-+
-+
-+/* Enable leak-tracking versions of ne_*alloc when NEON_MEMLEAK is enabled */
-+#ifdef NEON_MEMLEAK
-+# include "memleak.h"
-+#endif
-+
-+#if defined(HAVE_STPCPY) && defined(HAVE_DECL_STPCPY) && !HAVE_DECL_STPCPY && !defined(stpcpy)
-+char *stpcpy(char *, const char *);
-+#endif
-+
-+#ifdef WIN32
-+
-+#include <io.h>
-+
-+#define HAVE_SSPI 1
-+
-+#define HAVE_MEMCPY 1
-+
-+#define strncasecmp strnicmp
-+#define inline __inline
-+#define WIN32_LEAN_AND_MEAN
-+#define NOUSER
-+#define NOGDI
-+#define NONLS
-+#define NOCRYPT
-+#endif
---- misc/neon-0.28.2/src/makefile.mk 2008-08-25 14:36:04.640625000 +0200
-+++ misc/build/neon-0.28.2/src/makefile.mk 2008-08-25 14:32:17.671875000 +0200
-@@ -1 +1,54 @@
--dummy
-+PRJ=..$/..$/..$/..$/..
-+
-+PRJNAME=neon
-+TARGET=neon
-+LIBTARGET=NO
-+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE : settings.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+CDEFS+=-DHAVE_CONFIG_H
-+
-+.IF "$(SYSTEM_LIBXML)" == "YES"
-+CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS)
-+.ENDIF
-+
-+
-+SLOFILES= \
-+ $(SLO)$/ne_207.obj \
-+ $(SLO)$/ne_acl.obj \
-+ $(SLO)$/ne_alloc.obj \
-+ $(SLO)$/ne_auth.obj \
-+ $(SLO)$/ne_basic.obj \
-+ $(SLO)$/ne_compress.obj \
-+ $(SLO)$/ne_dates.obj \
-+ $(SLO)$/ne_i18n.obj \
-+ $(SLO)$/ne_locks.obj \
-+ $(SLO)$/ne_md5.obj \
-+ $(SLO)$/ne_props.obj \
-+ $(SLO)$/ne_redirect.obj \
-+ $(SLO)$/ne_request.obj \
-+ $(SLO)$/ne_session.obj \
-+ $(SLO)$/ne_socket.obj \
-+ $(SLO)$/ne_sspi.obj \
-+ $(SLO)$/ne_string.obj \
-+ $(SLO)$/ne_uri.obj \
-+ $(SLO)$/ne_utils.obj \
-+ $(SLO)$/ne_xml.obj \
-+ $(SLO)$/ne_xmlreq.obj \
-+ $(SLO)$/ne_openssl.obj
-+
-+# $(SLO)$/ne_gnutls.obj \
-+# $(SLO)$/ne_stubssl.obj
-+
-+LIB1TARGET=$(SLB)$/$(TARGET).lib
-+LIB1ARCHIV=$(LB)$/lib$(TARGET).a
-+LIB1OBJFILES=$(SLOFILES)
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE : target.mk
---- misc/neon-0.28.2/src/ne_207.c 2006-01-02 12:43:19.000000000 +0100
-+++ misc/build/neon-0.28.2/src/ne_207.c 2009-01-09 10:12:39.563530700 +0100
-@@ -177,7 +177,6 @@
- /* Now we have the href, begin the response */
- if (p->start_response && HAVE_CDATA(p)) {
- ne_uri ref, resolved;
--
- if (ne_uri_parse(cdata, &ref) == 0) {
- ne_uri_resolve(&p->base, &ref, &resolved);
-
-@@ -367,5 +366,4 @@
- ne_request_destroy(req);
-
- return ret;
--}
--
-+}
---- misc/neon-0.28.2/src/ne_auth.c 2008-02-29 17:30:12.000000000 +0100
-+++ misc/build/neon-0.28.2/src/ne_auth.c 2008-08-25 14:35:18.453125000 +0200
-@@ -598,9 +598,10 @@
- int ntlm = ne_strcasecmp(parms->protocol->name, "NTLM") == 0;
- int status;
- char *response = NULL;
--
-+ char password[NE_ABUFSIZ];
-+
- NE_DEBUG(NE_DBG_HTTPAUTH, "auth: SSPI challenge.\n");
--
-+
- if (!sess->sspi_context) {
- ne_uri uri = {0};
-
-@@ -614,8 +615,17 @@
- return status;
- }
- }
-+
-+ /* Authentification needs more than one http request.
-+ * As long as authentification in progress use the existing credentials.
-+ * Otherwise get new credentials.*/
-+ if (!parms->opaque)
-+ if (get_credentials(sess, errmsg, attempt, parms, password)) {
-+ /* Failed to get credentials */
-+ return -1;
-+ }
-
-- status = ne_sspi_authenticate(sess->sspi_context, parms->opaque, &response);
-+ status = ne_sspi_authenticate(sess->sspi_context, parms->opaque, &response, sess->username, password);
- if (status) {
- return status;
- }
-@@ -1413,6 +1423,7 @@
- /* note above: allow a 401 in response to a CONNECT request
- * from a proxy since some buggy proxies send that. */
- NE_DEBUG(NE_DBG_HTTPAUTH, "auth: Got challenge (code %d).\n", status->code);
-+
- if (!auth_challenge(sess, areq->attempt++, auth_hdr)) {
- ret = NE_RETRY;
- } else {
---- misc/neon-0.28.2/src/ne_defs.h 2006-10-24 21:40:09.000000000 +0200
-+++ misc/build/neon-0.28.2/src/ne_defs.h 2008-08-25 14:32:17.875000000 +0200
-@@ -41,7 +41,7 @@
- #endif
-
- /* define ssize_t for Win32 */
--#if defined(WIN32) && !defined(ssize_t)
-+#if defined(WIN32) && !defined(ssize_t) && !defined(__MINGW32__)
- #define ssize_t int
- #endif
-
---- misc/neon-0.28.2/src/ne_locks.h 2006-01-02 12:43:19.000000000 +0100
-+++ misc/build/neon-0.28.2/src/ne_locks.h 2008-08-25 14:32:17.937500000 +0200
-@@ -22,6 +22,10 @@
- #ifndef NE_LOCKS_H
- #define NE_LOCKS_H
-
-+# if defined __GNUC__
-+# pragma GCC system_header
-+# endif
-+
- #include "ne_request.h" /* for ne_session + ne_request */
- #include "ne_uri.h" /* for ne_uri */
-
---- misc/neon-0.28.2/src/ne_sspi.c 2007-08-10 17:26:08.000000000 +0200
-+++ misc/build/neon-0.28.2/src/ne_sspi.c 2009-01-09 10:31:05.752056400 +0100
-@@ -202,9 +202,48 @@
- return -1;
- }
-
-+ return 0;
-+}
-+
-+/*
-+ * Simplification wrapper arround AcquireCredentialsHandle as most of
-+ * the parameters do not change.
-+ */
-+static int acquireCredentialsHandleForUsername(CredHandle * credentials, char *package, const char *username, const char *password)
-+{
-+ SECURITY_STATUS status;
-+ TimeStamp timestamp;
-+
-+ const char *domain = "";
-+
-+ int rc, rcISC;
-+ SecPkgInfo *secPackInfo;
-+ SEC_WINNT_AUTH_IDENTITY *nameAndPwd = NULL;
-+ int bytesReceived = 0, bytesSent = 0;
-+
-+ nameAndPwd = (SEC_WINNT_AUTH_IDENTITY *) malloc( sizeof(SEC_WINNT_AUTH_IDENTITY) );
-+ memset( nameAndPwd, '\0', sizeof (*nameAndPwd) );
-+ nameAndPwd->Domain = (unsigned char *) _strdup( domain? domain: "" );
-+ nameAndPwd->DomainLength = domain? strlen( domain ): 0;
-+ nameAndPwd->User = (unsigned char *) _strdup( username? username: "" );
-+ nameAndPwd->UserLength = username? strlen( username ): 0;
-+ nameAndPwd->Password = (unsigned char *) _strdup( password? password: "" );
-+ nameAndPwd->PasswordLength = password? strlen( password ): 0;
-+ nameAndPwd->Flags = SEC_WINNT_AUTH_IDENTITY_ANSI;
-+
-+ status = pSFT->AcquireCredentialsHandle( NULL, package, SECPKG_CRED_OUTBOUND,
-+ NULL, nameAndPwd, NULL, NULL, credentials, &timestamp );
-+
-+ if (status != SEC_E_OK) {
-+ NE_DEBUG(NE_DBG_HTTPAUTH,
-+ "sspi: AcquireCredentialsHandle [fail] [%x].\n", status);
-+ return -1;
-+ }
-+
- return 0;
- }
-
-+
- /*
- * Wrapper arround initializeSecurityContext. Supplies several
- * default parameters as well as logging in case of errors.
-@@ -483,7 +522,7 @@
- * Processes received authentication tokens as well as supplies the
- * response token.
- */
--int ne_sspi_authenticate(void *context, const char *base64Token, char **responseToken)
-+int ne_sspi_authenticate(void *context, const char *base64Token, char **responseToken, const char* username, const char* password)
- {
- SecBufferDesc outBufferDesc;
- SecBuffer outBuffer;
-@@ -552,7 +591,7 @@
- {
- freeBuffer(&outBufferDesc);
- sspiContext->authfinished = 0;
-- NE_DEBUG(NE_DBG_HTTPAUTH,"sspi: failing because starting over from failed try.\n");
-+ NE_DEBUG(NE_DBG_HTTPAUTH,"sspi: fai6 over from failed try.\n");
- return -1;
- }
- sspiContext->authfinished = 0;
-@@ -560,14 +599,26 @@
-
- /* Reset any existing context since we are starting over */
- resetContext(sspiContext);
-+
-+ if (strlen(username) != 0) {
-+ if (acquireCredentialsHandleForUsername
-+ (&sspiContext->credentials, sspiContext->mechanism, username, password) != SEC_E_OK) {
-+ freeBuffer(&outBufferDesc);
-+ NE_DEBUG(NE_DBG_HTTPAUTH,
-+ "sspi: acquireCredentialsHandleForUsername failed.\n");
-+ return -1;
-+ }
-+ } else {
-+ if (acquireCredentialsHandle
-+ (&sspiContext->credentials, sspiContext->mechanism) != SEC_E_OK) {
-+ freeBuffer(&outBufferDesc);
-+ NE_DEBUG(NE_DBG_HTTPAUTH,
-+ "sspi: acquireCredentialsHandle failed.\n");
-+ return -1;
-+ }
-+ }
-
-- if (acquireCredentialsHandle
-- (&sspiContext->credentials, sspiContext->mechanism) != SEC_E_OK) {
-- freeBuffer(&outBufferDesc);
-- NE_DEBUG(NE_DBG_HTTPAUTH,
-- "sspi: acquireCredentialsHandle failed.\n");
-- return -1;
-- }
-+
-
- securityStatus =
- initializeSecurityContext(&sspiContext->credentials, NULL,
---- misc/neon-0.28.2/src/ne_sspi.h 2006-02-12 13:05:14.000000000 +0100
-+++ misc/build/neon-0.28.2/src/ne_sspi.h 2008-08-25 14:32:18.000000000 +0200
-@@ -41,7 +41,7 @@
- int ne_sspi_clear_context(void *context);
-
- int ne_sspi_authenticate(void *context, const char *base64Token,
-- char **responseToken);
-+ char **responseToken, const char* username, const char* password);
-
- #endif /* HAVE_SSPI */
-
---- misc/neon-0.28.2/src/ne_uri.c 2007-12-05 12:04:47.000000000 +0100
-+++ misc/build/neon-0.28.2/src/ne_uri.c 2009-01-09 10:21:45.201720200 +0100
-@@ -42,7 +42,7 @@
- #include "ne_alloc.h"
- #include "ne_uri.h"
-
--/* URI ABNF from RFC 3986: */
-+/* URI ABNF from RFC 3986: (TKR: SharePoint is contradictory to this RFC. So I fix it here. )*/
-
- #define PS (0x0001) /* "+" */
- #define PC (0x0002) /* "%" */
-@@ -67,6 +67,9 @@
-
- #define OT (0x4000) /* others */
-
-+/* TKR new symbol */
-+#define WS (0x8000) /* Whitespaces ( Space, Tab ) */
-+
- #define URI_ALPHA (AL)
- #define URI_DIGIT (DG)
-
-@@ -83,20 +86,21 @@
- /* pchar = unreserved / pct-encoded / sub-delims / ":" / "@" */
- #define URI_PCHAR (URI_UNRESERVED | PC | URI_SUBDELIM | CL | AT)
- /* invented: segchar = pchar / "/" */
--#define URI_SEGCHAR (URI_PCHAR | FS)
-+/* (TKR) WS added */
-+#define URI_SEGCHAR (URI_PCHAR | FS | WS)
- /* query = *( pchar / "/" / "?" ) */
- #define URI_QUERY (URI_PCHAR | FS | QU)
- /* fragment == query */
- #define URI_FRAGMENT URI_QUERY
-
- /* any characters which should be path-escaped: */
--#define URI_ESCAPE ((URI_GENDELIM & ~(FS)) | URI_SUBDELIM | OT | PC)
-+#define URI_ESCAPE ((URI_GENDELIM & ~(FS)) | URI_SUBDELIM | OT | WS | PC)
-
- static const unsigned int uri_chars[256] = {
- /* 0xXX x0 x2 x4 x6 x8 xA xC xE */
--/* 0x */ OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT,
-+/* 0x */ OT, OT, OT, OT, OT, OT, OT, OT, OT, WS, OT, OT, OT, OT, OT, OT,
- /* 1x */ OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT,
--/* 2x */ OT, SD, OT, GD, SD, PC, SD, SD, SD, SD, SD, PS, SD, DS, DT, FS,
-+/* 2x */ WS, SD, OT, GD, SD, PC, SD, SD, SD, SD, SD, PS, SD, DS, DT, FS,
- /* 3x */ DG, DG, DG, DG, DG, DG, DG, DG, DG, DG, CL, SD, OT, SD, OT, QU,
- /* 4x */ AT, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL,
- /* 5x */ AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, GD, OT, GD, OT, US,
+--- misc/neon-0.28.2/src/config.h 2008-08-25 14:36:05.062500000 +0200
++++ misc/build/neon-0.28.2/src/config.h 2008-08-25 14:32:17.656250000 +0200
+@@ -1 +1,479 @@
+-dummy
++
++/* Define to specific EGD socket path */
++/* #undef EGD_PATH */
++
++/* Define if EGD should be supported */
++/* #undef ENABLE_EGD */
++
++/* Define if GSS_C_NT_HOSTBASED_SERVICE is not defined otherwise */
++/* #undef GSS_C_NT_HOSTBASED_SERVICE */
++
++/* Define to 1 if you have the <arpa/inet.h> header file. */
++#ifdef UNX
++#define HAVE_ARPA_INET_H 1
++#endif
++
++/* Define to 1 if you have the `bind_textdomain_codeset' function. */
++/* #undef HAVE_BIND_TEXTDOMAIN_CODESET 1 */
++
++/* Define to 1 if you have the declaration of `h_errno', and to 0 if you
++ don't. */
++#ifdef WIN32
++#define HAVE_DECL_H_ERRNO 1
++#endif
++
++/* Define to 1 if you have the declaration of `stpcpy', and to 0 if you don't.
++ */
++#ifdef LINUX
++#define HAVE_DECL_STPCPY 1
++#endif
++
++/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you
++ don't. */
++#ifdef LINUX
++#define HAVE_DECL_STRERROR_R 1
++#endif
++
++/* Define to 1 if you have the <dlfcn.h> header file. */
++#ifdef UNX
++#define HAVE_DLFCN_H 1
++#endif
++
++/* Define to 1 if you have the <errno.h> header file. */
++#define HAVE_ERRNO_H 1
++
++/* Define if you have expat */
++/* #undef HAVE_EXPAT */
++
++/* Define to 1 if you have the `fstat64' function. */
++#define HAVE_FSTAT64
++
++/* Define to 1 if you have the `gai_strerror' function. */
++#define HAVE_GAI_STRERROR 1
++
++/* Define if GnuTLS support is enabled */
++/* #undef HAVE_GNUTLS */
++
++/* Define to 1 if you have the `gnutls_session_get_data2' function. */
++/* #undef HAVE_GNUTLS_SESSION_GET_DATA2 */
++
++/* Define if GSSAPI support is enabled */
++/* #undef HAVE_GSSAPI */
++
++/* Define to 1 if you have the <gssapi/gssapi_generic.h> header file. */
++/* #undef HAVE_GSSAPI_GSSAPI_GENERIC_H */
++
++/* Define to 1 if you have the <gssapi/gssapi.h> header file. */
++/* #undef HAVE_GSSAPI_GSSAPI_H */
++
++/* Define to 1 if you have the <gssapi.h> header file. */
++/* #undef HAVE_GSSAPI_H */
++
++/* Define to 1 if you have the `gss_init_sec_context' function. */
++/* #undef HAVE_GSS_INIT_SEC_CONTEXT */
++
++/* Define to 1 if you have the `hstrerror' function. */
++/* #undef HAVE_HSTRERROR */
++
++/* Define to 1 if you have the `inet_ntop' function. */
++#ifdef UNX
++#define HAVE_INET_NTOP 1
++#endif
++
++/* Define to 1 if you have the <inttypes.h> header file. */
++#ifdef UNX
++#define HAVE_INTTYPES_H 1
++#endif
++
++/* Define to 1 if you have the `isatty' function. */
++#define HAVE_ISATTY 1
++
++/* Define to 1 if you have the <libintl.h> header file. */
++/* #undef HAVE_LIBINTL_H */
++
++/* Define if you have libxml */
++#define HAVE_LIBXML 1
++
++/* Define to 1 if you have the <libxml/parser.h> header file. */
++#define HAVE_LIBXML_PARSER_H 1
++
++/* Define to 1 if you have the <libxml/xmlversion.h> header file. */
++#define HAVE_LIBXML_XMLVERSION_H 1
++
++/* Define to 1 if you have the <limits.h> header file. */
++#define HAVE_LIMITS_H 1
++
++/* Define to 1 if you have the <locale.h> header file. */
++#define HAVE_LOCALE_H 1
++
++/* Define to 1 if you have the `lseek64' function. */
++#define HAVE_LSEEK64 1
++
++/* Define to 1 if you have the <memory.h> header file. */
++#define HAVE_MEMORY_H 1
++
++/* Define to 1 if you have the <netdb.h> header file. */
++#ifdef UNX
++#define HAVE_NETDB_H 1
++#endif
++
++/* Define to 1 if you have the <netinet/in.h> header file. */
++#ifdef UNX
++#define HAVE_NETINET_IN_H 1
++#endif
++
++/* Define to 1 if you have the <netinet/tcp.h> header file. */
++#ifdef UNX
++#define HAVE_NETINET_TCP_H 1
++#endif
++
++/* Define if OpenSSL support is enabled */
++/* #undef HAVE_OPENSSL */
++#define HAVE_OPENSSL
++/* Define to 1 if you have the <openssl/opensslv.h> header file. */
++/* #undef HAVE_OPENSSL_OPENSSLV_H */
++#define HAVE_OPENSSL_OPENSSLV_H 1
++/* Define to 1 if you have the <openssl/ssl.h> header file. */
++/* #undef HAVE_OPENSSL_SSL_H */
++#define HAVE_OPENSSL_SSL_H 1
++/* Define to 1 if you have the `pipe' function. */
++#define HAVE_PIPE 1
++
++/* Define to 1 if you have the `poll' function. */
++#define HAVE_POLL 1
++
++/* Define to 1 if you have the `pthread_mutex_init' function. */
++/* #undef HAVE_PTHREAD_MUTEX_INIT */
++
++/* Define to 1 if you have the `pthread_mutex_lock' function. */
++/* #undef HAVE_PTHREAD_MUTEX_LOCK */
++
++/* Define to 1 if you have the `setlocale' function. */
++#define HAVE_SETLOCALE 1
++
++/* Define to 1 if you have the `setsockopt' function. */
++#if defined (LINUX) || defined (WIN32)
++#define HAVE_SETSOCKOPT 1
++#endif
++
++/* Define to 1 if you have the `setvbuf' function. */
++#define HAVE_SETVBUF 1
++
++/* Define to 1 if you have the `shutdown' function. */
++#ifdef LINUX
++#define HAVE_SHUTDOWN 1
++#endif
++
++/* Define to 1 if you have the `signal' function. */
++#define HAVE_SIGNAL 1
++
++/* Define to 1 if you have the <signal.h> header file. */
++#define HAVE_SIGNAL_H 1
++
++/* Define to 1 if you have the `snprintf' function. */
++#ifdef UNX
++#define HAVE_SNPRINTF 1
++#endif
++
++#ifdef WIN32
++#define snprintf _snprintf
++#endif
++
++/* Define to 1 if you have the <socks.h> header file. */
++/* #undef HAVE_SOCKS_H */
++
++/* Define to 1 if you have the <stdarg.h> header file. */
++#define HAVE_STDARG_H 1
++
++/* Define to 1 if you have the <stdint.h> header file. */
++#define HAVE_STDINT_H 1
++
++/* Define to 1 if you have the <stdlib.h> header file. */
++#define HAVE_STDLIB_H 1
++
++/* Define to 1 if you have the `stpcpy' function. */
++#ifdef LINUX
++#define HAVE_STPCPY 1
++#endif
++
++/* Define to 1 if you have the `strcasecmp' function. */
++#ifdef UNX
++#define HAVE_STRCASECMP 1
++#endif
++
++#ifdef WIN32
++#define strcasecmp strcmpi
++#endif
++
++/* Define to 1 if you have the `strerror_r' function. */
++#ifdef LINUX
++#define HAVE_STRERROR_R 1
++#endif
++
++/* Define to 1 if you have the <strings.h> header file. */
++#ifdef UNX
++#define HAVE_STRINGS_H 1
++#endif
++
++/* Define to 1 if you have the <string.h> header file. */
++#define HAVE_STRING_H 1
++
++/* Define to 1 if you have the `strtoll' function. */
++#define HAVE_STRTOLL 1
++
++/* Define to 1 if you have the `strtoq' function. */
++/* #undef HAVE_STRTOQ */
++
++/* Define to 1 if `tm_gmtoff' is member of `struct tm'. */
++#ifdef LINUX
++#define HAVE_STRUCT_TM_TM_GMTOFF 1
++#endif
++
++/* Define to 1 if `__tm_gmtoff' is member of `struct tm'. */
++/* #undef HAVE_STRUCT_TM___TM_GMTOFF */
++
++/* Define to 1 if you have the <sys/limits.h> header file. */
++/* #undef HAVE_SYS_LIMITS_H */
++
++/* Define to 1 if you have the <sys/poll.h> header file. */
++#ifdef UNX
++#define HAVE_SYS_POLL_H 1
++#endif
++
++/* Define to 1 if you have the <sys/select.h> header file. */
++#ifdef UNX
++#define HAVE_SYS_SELECT_H 1
++#endif
++
++/* Define to 1 if you have the <sys/socket.h> header file. */
++#ifdef UNX
++#define HAVE_SYS_SOCKET_H 1
++#endif
++
++/* Define to 1 if you have the <sys/stat.h> header file. */
++#define HAVE_SYS_STAT_H 1
++
++/* Define to 1 if you have the <sys/time.h> header file. */
++#ifdef UNX
++#define HAVE_SYS_TIME_H 1
++#endif
++
++/* Define to 1 if you have the <sys/types.h> header file. */
++#define HAVE_SYS_TYPES_H 1
++
++/* Define if the timezone global is available */
++#ifndef MACOSX
++#define HAVE_TIMEZONE 1
++#endif
++
++/* Use trio printf replacement library */
++/* #undef HAVE_TRIO */
++
++/* Define to 1 if you have the <trio.h> header file. */
++/* #undef HAVE_TRIO_H */
++
++/* Define to 1 if you have the <unistd.h> header file. */
++#ifdef UNX
++#define HAVE_UNISTD_H 1
++#endif
++
++/* Define to 1 if you have the `usleep' function. */
++#ifdef UNX
++#define HAVE_USLEEP 1
++#endif
++
++/* Define to 1 if you have the `vsnprintf' function. */
++#if defined( UNX ) || (defined(_MSC_VER) && (_MSC_VER > 1400))
++#define HAVE_VSNPRINTF 1
++#endif
++
++#ifdef WIN32
++#if (defined(_MSC_VER) && (_MSC_VER < 1500)) || defined(__MINGW32__)
++#define vsnprintf _vsnprintf
++#endif
++#endif
++
++/* Define to be location of localedir */
++/* #undef LOCALEDIR */
++
++/* Defined when neon is built as a library */
++#define NEON_IS_LIBRARY 1
++
++/* Define to be the neon version string */
++#define NEON_VERSION "0.26.3"
++
++/* Define to enable debugging */
++/* #undef NE_DEBUGGING */
++
++/* Define to be printf format string for off64_t */
++#define NE_FMT_OFF64_T "lld"
++
++/* Define to be printf format string for off_t */
++#define NE_FMT_OFF_T "ld"
++
++/* Define to be printf format string for size_t */
++#define NE_FMT_SIZE_T "u"
++
++/* Define to be printf format string for ssize_t */
++#define NE_FMT_SSIZE_T "d"
++
++/* Define to be printf format string for time_t */
++#define NE_FMT_TIME_T "ld"
++
++/* Defined if DAV is supported */
++#define NE_HAVE_DAV 1
++
++/* Defined if I18N is supported */
++/* #undef NE_HAVE_I18N 1 */
++
++/* Defined if IPV6 is supported */
++#define NE_HAVE_IPV6 1
++
++/* Defined if LFS is supported */
++#define NE_HAVE_LFS 1
++
++/* Defined if SOCKS is supported */
++/* #undef NE_HAVE_SOCKS */
++
++/* Defined if SSL is supported */
++/* #undef NE_HAVE_SSL */
++#define NE_HAVE_SSL
++/* Defined if TS_SSL is supported */
++/* #undef NE_HAVE_TS_SSL */
++
++/* Defined if ZLIB is supported */
++/* #undef NE_HAVE_ZLIB */
++
++/* Define to be filename of an SSL CA root bundle */
++/* #undef NE_SSL_CA_BUNDLE */
++
++/* Define if poll() should be used */
++#ifdef UNX
++#define NE_USE_POLL 1
++#endif
++
++/* Define to be neon library major version */
++#define NE_VERSION_MAJOR (0)
++
++/* Define to be neon library minor version */
++#define NE_VERSION_MINOR (26)
++
++/* Define to be neon library patch version */
++#define NE_VERSION_PATCH (3)
++
++/* Define to the address where bug reports for this package should be sent. */
++#define PACKAGE_BUGREPORT "neon@webdav.org"
++
++/* Define to the full name of this package. */
++#define PACKAGE_NAME "neon"
++
++/* Define to the full name and version of this package. */
++#define PACKAGE_STRING "neon 0.26.3"
++
++/* Define to the one symbol short name of this package. */
++#define PACKAGE_TARNAME "neon"
++
++/* Define to the version of this package. */
++#define PACKAGE_VERSION "0.26.3"
++
++/* The size of a `int', as computed by sizeof. */
++#define SIZEOF_INT 4
++
++/* The size of a `long', as computed by sizeof. */
++#define SIZEOF_LONG 4
++
++/* The size of a `long long', as computed by sizeof. */
++#define SIZEOF_LONG_LONG 8
++
++/* The size of a `off64_t', as computed by sizeof. */
++#define SIZEOF_OFF64_T 8
++
++/* The size of a `off_t', as computed by sizeof. */
++#define SIZEOF_OFF_T 4
++
++/* The size of a `size_t', as computed by sizeof. */
++#define SIZEOF_SIZE_T 4
++
++/* The size of a `ssize_t', as computed by sizeof. */
++#define SIZEOF_SSIZE_T 4
++
++/* The size of a `time_t', as computed by sizeof. */
++#define SIZEOF_TIME_T 4
++
++/* Define to 1 if you have the ANSI C header files. */
++#ifdef SOLARIS
++#define STDC_HEADERS 1
++#endif
++
++/* Define to 1 if strerror_r returns char *. */
++#ifdef LINUX
++#define STRERROR_R_CHAR_P 1
++#endif
++
++/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
++#define TIME_WITH_SYS_TIME 1
++
++/* Define if getaddrinfo supports AI_ADDRCONFIG */
++/* #undef USE_GAI_ADDRCONFIG */
++
++/* Define if getaddrinfo() should be used */
++#define USE_GETADDRINFO 1
++
++/* Define to 1 if your processor stores words with the most significant byte
++ first (like Motorola and SPARC, unlike Intel and VAX). */
++#if defined (SOLARIS) && defined (SPARC)
++#define WORDS_BIGENDIAN 1
++#endif
++
++/* Always defined to enable GNU extensions */
++#define _GNU_SOURCE 1
++
++/* Define to empty if `const' does not conform to ANSI C. */
++/* #undef const */
++
++/* Define if in_addr_t is not available */
++/* #undef in_addr_t */
++
++/* Define to `__inline__' or `__inline' if that's what the C compiler
++ calls it, or to nothing if 'inline' is not supported under any name. */
++#ifndef __cplusplus
++#if defined (SOLARIS) && defined (__SUNPRO_C)
++#define inline
++#endif
++#endif
++
++/* Define to `long' if <sys/types.h> does not define. */
++/* #undef off_t */
++
++/* Define to `int' if <sys/types.h> does not define. */
++/* #undef pid_t */
++
++/* Define to `unsigned' if <sys/types.h> does not define. */
++/* #undef size_t */
++
++
++/* Enable leak-tracking versions of ne_*alloc when NEON_MEMLEAK is enabled */
++#ifdef NEON_MEMLEAK
++# include "memleak.h"
++#endif
++
++#if defined(HAVE_STPCPY) && defined(HAVE_DECL_STPCPY) && !HAVE_DECL_STPCPY && !defined(stpcpy)
++char *stpcpy(char *, const char *);
++#endif
++
++#ifdef WIN32
++
++#include <io.h>
++
++#define HAVE_SSPI 1
++
++#define HAVE_MEMCPY 1
++
++#define strncasecmp strnicmp
++#define inline __inline
++#define WIN32_LEAN_AND_MEAN
++#define NOUSER
++#define NOGDI
++#define NONLS
++#define NOCRYPT
++#endif
+--- misc/neon-0.28.2/src/makefile.mk 2008-08-25 14:36:04.640625000 +0200
++++ misc/build/neon-0.28.2/src/makefile.mk 2008-08-25 14:32:17.671875000 +0200
+@@ -1 +1,54 @@
+-dummy
++PRJ=..$/..$/..$/..$/..
++
++PRJNAME=neon
++TARGET=neon
++LIBTARGET=NO
++EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
++
++# --- Settings -----------------------------------------------------
++
++.INCLUDE : settings.mk
++
++# --- Files --------------------------------------------------------
++
++CDEFS+=-DHAVE_CONFIG_H
++
++.IF "$(SYSTEM_LIBXML)" == "YES"
++CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS)
++.ENDIF
++
++
++SLOFILES= \
++ $(SLO)$/ne_207.obj \
++ $(SLO)$/ne_acl.obj \
++ $(SLO)$/ne_alloc.obj \
++ $(SLO)$/ne_auth.obj \
++ $(SLO)$/ne_basic.obj \
++ $(SLO)$/ne_compress.obj \
++ $(SLO)$/ne_dates.obj \
++ $(SLO)$/ne_i18n.obj \
++ $(SLO)$/ne_locks.obj \
++ $(SLO)$/ne_md5.obj \
++ $(SLO)$/ne_props.obj \
++ $(SLO)$/ne_redirect.obj \
++ $(SLO)$/ne_request.obj \
++ $(SLO)$/ne_session.obj \
++ $(SLO)$/ne_socket.obj \
++ $(SLO)$/ne_sspi.obj \
++ $(SLO)$/ne_string.obj \
++ $(SLO)$/ne_uri.obj \
++ $(SLO)$/ne_utils.obj \
++ $(SLO)$/ne_xml.obj \
++ $(SLO)$/ne_xmlreq.obj \
++ $(SLO)$/ne_openssl.obj
++
++# $(SLO)$/ne_gnutls.obj \
++# $(SLO)$/ne_stubssl.obj
++
++LIB1TARGET=$(SLB)$/$(TARGET).lib
++LIB1ARCHIV=$(LB)$/lib$(TARGET).a
++LIB1OBJFILES=$(SLOFILES)
++
++# --- Targets ------------------------------------------------------
++
++.INCLUDE : target.mk
+--- misc/neon-0.28.2/src/ne_207.c 2006-01-02 12:43:19.000000000 +0100
++++ misc/build/neon-0.28.2/src/ne_207.c 2009-01-09 10:12:39.563530700 +0100
+@@ -177,7 +177,6 @@
+ /* Now we have the href, begin the response */
+ if (p->start_response && HAVE_CDATA(p)) {
+ ne_uri ref, resolved;
+-
+ if (ne_uri_parse(cdata, &ref) == 0) {
+ ne_uri_resolve(&p->base, &ref, &resolved);
+
+@@ -367,5 +366,4 @@
+ ne_request_destroy(req);
+
+ return ret;
+-}
+-
++}
+--- misc/neon-0.28.2/src/ne_auth.c 2008-02-29 17:30:12.000000000 +0100
++++ misc/build/neon-0.28.2/src/ne_auth.c 2008-08-25 14:35:18.453125000 +0200
+@@ -598,9 +598,10 @@
+ int ntlm = ne_strcasecmp(parms->protocol->name, "NTLM") == 0;
+ int status;
+ char *response = NULL;
+-
++ char password[NE_ABUFSIZ];
++
+ NE_DEBUG(NE_DBG_HTTPAUTH, "auth: SSPI challenge.\n");
+-
++
+ if (!sess->sspi_context) {
+ ne_uri uri = {0};
+
+@@ -614,8 +615,17 @@
+ return status;
+ }
+ }
++
++ /* Authentification needs more than one http request.
++ * As long as authentification in progress use the existing credentials.
++ * Otherwise get new credentials.*/
++ if (!parms->opaque)
++ if (get_credentials(sess, errmsg, attempt, parms, password)) {
++ /* Failed to get credentials */
++ return -1;
++ }
+
+- status = ne_sspi_authenticate(sess->sspi_context, parms->opaque, &response);
++ status = ne_sspi_authenticate(sess->sspi_context, parms->opaque, &response, sess->username, password);
+ if (status) {
+ return status;
+ }
+@@ -1413,6 +1423,7 @@
+ /* note above: allow a 401 in response to a CONNECT request
+ * from a proxy since some buggy proxies send that. */
+ NE_DEBUG(NE_DBG_HTTPAUTH, "auth: Got challenge (code %d).\n", status->code);
++
+ if (!auth_challenge(sess, areq->attempt++, auth_hdr)) {
+ ret = NE_RETRY;
+ } else {
+--- misc/neon-0.28.2/src/ne_defs.h 2006-10-24 21:40:09.000000000 +0200
++++ misc/build/neon-0.28.2/src/ne_defs.h 2008-08-25 14:32:17.875000000 +0200
+@@ -41,7 +41,7 @@
+ #endif
+
+ /* define ssize_t for Win32 */
+-#if defined(WIN32) && !defined(ssize_t)
++#if defined(WIN32) && !defined(ssize_t) && !defined(__MINGW32__)
+ #define ssize_t int
+ #endif
+
+--- misc/neon-0.28.2/src/ne_locks.h 2006-01-02 12:43:19.000000000 +0100
++++ misc/build/neon-0.28.2/src/ne_locks.h 2008-08-25 14:32:17.937500000 +0200
+@@ -22,6 +22,10 @@
+ #ifndef NE_LOCKS_H
+ #define NE_LOCKS_H
+
++# if defined __GNUC__
++# pragma GCC system_header
++# endif
++
+ #include "ne_request.h" /* for ne_session + ne_request */
+ #include "ne_uri.h" /* for ne_uri */
+
+--- misc/neon-0.28.2/src/ne_socket.c 2006-10-30 14:18:51.000000000 +0100
++++ misc/build/neon-0.28.2/src/ne_socket.c 2008-07-16 13:32:11.022546400 +0200
+@@ -60,6 +60,7 @@
+ #include <stddef.h>
+ #ifdef USE_GETADDRINFO
+ #include <ws2tcpip.h>
++#include <Wspiapi.h>
+ #endif
+ #endif
+
+--- misc/neon-0.28.2/src/ne_sspi.c 2007-08-10 17:26:08.000000000 +0200
++++ misc/build/neon-0.28.2/src/ne_sspi.c 2009-01-09 10:31:05.752056400 +0100
+@@ -202,9 +202,48 @@
+ return -1;
+ }
+
++ return 0;
++}
++
++/*
++ * Simplification wrapper arround AcquireCredentialsHandle as most of
++ * the parameters do not change.
++ */
++static int acquireCredentialsHandleForUsername(CredHandle * credentials, char *package, const char *username, const char *password)
++{
++ SECURITY_STATUS status;
++ TimeStamp timestamp;
++
++ const char *domain = "";
++
++ int rc, rcISC;
++ SecPkgInfo *secPackInfo;
++ SEC_WINNT_AUTH_IDENTITY *nameAndPwd = NULL;
++ int bytesReceived = 0, bytesSent = 0;
++
++ nameAndPwd = (SEC_WINNT_AUTH_IDENTITY *) malloc( sizeof(SEC_WINNT_AUTH_IDENTITY) );
++ memset( nameAndPwd, '\0', sizeof (*nameAndPwd) );
++ nameAndPwd->Domain = (unsigned char *) _strdup( domain? domain: "" );
++ nameAndPwd->DomainLength = domain? strlen( domain ): 0;
++ nameAndPwd->User = (unsigned char *) _strdup( username? username: "" );
++ nameAndPwd->UserLength = username? strlen( username ): 0;
++ nameAndPwd->Password = (unsigned char *) _strdup( password? password: "" );
++ nameAndPwd->PasswordLength = password? strlen( password ): 0;
++ nameAndPwd->Flags = SEC_WINNT_AUTH_IDENTITY_ANSI;
++
++ status = pSFT->AcquireCredentialsHandle( NULL, package, SECPKG_CRED_OUTBOUND,
++ NULL, nameAndPwd, NULL, NULL, credentials, &timestamp );
++
++ if (status != SEC_E_OK) {
++ NE_DEBUG(NE_DBG_HTTPAUTH,
++ "sspi: AcquireCredentialsHandle [fail] [%x].\n", status);
++ return -1;
++ }
++
+ return 0;
+ }
+
++
+ /*
+ * Wrapper arround initializeSecurityContext. Supplies several
+ * default parameters as well as logging in case of errors.
+@@ -483,7 +522,7 @@
+ * Processes received authentication tokens as well as supplies the
+ * response token.
+ */
+-int ne_sspi_authenticate(void *context, const char *base64Token, char **responseToken)
++int ne_sspi_authenticate(void *context, const char *base64Token, char **responseToken, const char* username, const char* password)
+ {
+ SecBufferDesc outBufferDesc;
+ SecBuffer outBuffer;
+@@ -552,7 +591,7 @@
+ {
+ freeBuffer(&outBufferDesc);
+ sspiContext->authfinished = 0;
+- NE_DEBUG(NE_DBG_HTTPAUTH,"sspi: failing because starting over from failed try.\n");
++ NE_DEBUG(NE_DBG_HTTPAUTH,"sspi: fai6 over from failed try.\n");
+ return -1;
+ }
+ sspiContext->authfinished = 0;
+@@ -560,14 +599,26 @@
+
+ /* Reset any existing context since we are starting over */
+ resetContext(sspiContext);
++
++ if (strlen(username) != 0) {
++ if (acquireCredentialsHandleForUsername
++ (&sspiContext->credentials, sspiContext->mechanism, username, password) != SEC_E_OK) {
++ freeBuffer(&outBufferDesc);
++ NE_DEBUG(NE_DBG_HTTPAUTH,
++ "sspi: acquireCredentialsHandleForUsername failed.\n");
++ return -1;
++ }
++ } else {
++ if (acquireCredentialsHandle
++ (&sspiContext->credentials, sspiContext->mechanism) != SEC_E_OK) {
++ freeBuffer(&outBufferDesc);
++ NE_DEBUG(NE_DBG_HTTPAUTH,
++ "sspi: acquireCredentialsHandle failed.\n");
++ return -1;
++ }
++ }
+
+- if (acquireCredentialsHandle
+- (&sspiContext->credentials, sspiContext->mechanism) != SEC_E_OK) {
+- freeBuffer(&outBufferDesc);
+- NE_DEBUG(NE_DBG_HTTPAUTH,
+- "sspi: acquireCredentialsHandle failed.\n");
+- return -1;
+- }
++
+
+ securityStatus =
+ initializeSecurityContext(&sspiContext->credentials, NULL,
+--- misc/neon-0.28.2/src/ne_sspi.h 2006-02-12 13:05:14.000000000 +0100
++++ misc/build/neon-0.28.2/src/ne_sspi.h 2008-08-25 14:32:18.000000000 +0200
+@@ -41,7 +41,7 @@
+ int ne_sspi_clear_context(void *context);
+
+ int ne_sspi_authenticate(void *context, const char *base64Token,
+- char **responseToken);
++ char **responseToken, const char* username, const char* password);
+
+ #endif /* HAVE_SSPI */
+
+--- misc/neon-0.28.2/src/ne_uri.c 2007-12-05 12:04:47.000000000 +0100
++++ misc/build/neon-0.28.2/src/ne_uri.c 2009-01-09 10:21:45.201720200 +0100
+@@ -42,7 +42,7 @@
+ #include "ne_alloc.h"
+ #include "ne_uri.h"
+
+-/* URI ABNF from RFC 3986: */
++/* URI ABNF from RFC 3986: (TKR: SharePoint is contradictory to this RFC. So I fix it here. )*/
+
+ #define PS (0x0001) /* "+" */
+ #define PC (0x0002) /* "%" */
+@@ -67,6 +67,9 @@
+
+ #define OT (0x4000) /* others */
+
++/* TKR new symbol */
++#define WS (0x8000) /* Whitespaces ( Space, Tab ) */
++
+ #define URI_ALPHA (AL)
+ #define URI_DIGIT (DG)
+
+@@ -83,20 +86,21 @@
+ /* pchar = unreserved / pct-encoded / sub-delims / ":" / "@" */
+ #define URI_PCHAR (URI_UNRESERVED | PC | URI_SUBDELIM | CL | AT)
+ /* invented: segchar = pchar / "/" */
+-#define URI_SEGCHAR (URI_PCHAR | FS)
++/* (TKR) WS added */
++#define URI_SEGCHAR (URI_PCHAR | FS | WS)
+ /* query = *( pchar / "/" / "?" ) */
+ #define URI_QUERY (URI_PCHAR | FS | QU)
+ /* fragment == query */
+ #define URI_FRAGMENT URI_QUERY
+
+ /* any characters which should be path-escaped: */
+-#define URI_ESCAPE ((URI_GENDELIM & ~(FS)) | URI_SUBDELIM | OT | PC)
++#define URI_ESCAPE ((URI_GENDELIM & ~(FS)) | URI_SUBDELIM | OT | WS | PC)
+
+ static const unsigned int uri_chars[256] = {
+ /* 0xXX x0 x2 x4 x6 x8 xA xC xE */
+-/* 0x */ OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT,
++/* 0x */ OT, OT, OT, OT, OT, OT, OT, OT, OT, WS, OT, OT, OT, OT, OT, OT,
+ /* 1x */ OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT,
+-/* 2x */ OT, SD, OT, GD, SD, PC, SD, SD, SD, SD, SD, PS, SD, DS, DT, FS,
++/* 2x */ WS, SD, OT, GD, SD, PC, SD, SD, SD, SD, SD, PS, SD, DS, DT, FS,
+ /* 3x */ DG, DG, DG, DG, DG, DG, DG, DG, DG, DG, CL, SD, OT, SD, OT, QU,
+ /* 4x */ AT, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL,
+ /* 5x */ AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, GD, OT, GD, OT, US,