On Thu, Oct 13, 2005 at 03:38:55PM -0400, Mikhail Teterin wrote:
> > > = test/request.c: that code triggered a real bug which was fixed recently
> > >
> > > Can we have a patch, please? Or is 0.25.4 going to be out in a few days?
> >
> > The patch is r729 in the SVN repos
> > (http://svn.webdav.org/repos/projects/neon/trunk) - I might be able to
> > do a new release that soon, not sure.
>
> I've never used subversion -- can you, please, provide direct link to the
> patch?
Attached.
> > Please supply the debug.log and child.log produced from running:
> >
> > make check TESTS=lock
>
> Attached.
Thanks. Can you try this patch?
Index: test/common/child.c
===================================================================
--- test/common/child.c (revision 728)
+++ test/common/child.c (working copy)
@@ -1,6 +1,6 @@
/*
Framework for testing with a server process
- Copyright (C) 2001-2004, Joe Orton <[EMAIL PROTECTED]>
+ Copyright (C) 2001-2005, Joe Orton <[EMAIL PROTECTED]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -149,7 +149,7 @@
char buf[20];
int fd = ne_sock_fd(sock);
- shutdown(fd, 0);
+ shutdown(fd, 1);
while (ne_sock_read(sock, buf, sizeof buf) > 0);
#endif
return ne_sock_close(sock);
Index: src/ne_request.c
===================================================================
--- src/ne_request.c (revision 728)
+++ src/ne_request.c (revision 729)
@@ -71,24 +71,33 @@
struct body_reader *next;
};
+#if !defined(LONG_LONG_MAX) && defined(LLONG_MAX)
+#define LONG_LONG_MAX LLONG_MAX
+#endif
+
#ifdef NE_LFS
#define ne_lseek lseek64
typedef off64_t ne_off_t;
#define FMT_NE_OFF_T NE_FMT_OFF64_T
-#if defined(LONG_LONG_MAX) && !defined(LLONG_MAX)
-#define LLONG_MAX LONG_LONG_MAX
-#endif
-#define NE_OFFT_MAX LLONG_MAX
+#define NE_OFFT_MAX LONG_LONG_MAX
#ifdef HAVE_STRTOLL
#define ne_strtoff strtoll
#else
#define ne_strtoff strtoq
#endif
#else /* !NE_LFS */
+
typedef off_t ne_off_t;
#define ne_lseek lseek
#define FMT_NE_OFF_T NE_FMT_OFF_T
+
+#if defined(SIZEOF_LONG_LONG) && defined(LONG_LONG_MAX) \
+ && SIZEOF_OFF_T == SIZEOF_LONG_LONG
+#define NE_OFFT_MAX LONG_LONG_MAX
+#else
#define NE_OFFT_MAX LONG_MAX
+#endif
+
#if SIZEOF_OFF_T > SIZEOF_LONG && defined(HAVE_STRTOLL)
#define ne_strtoff strtoll
#elif SIZEOF_OFF_T > SIZEOF_LONG && defined(HAVE_STRTOQ)
_______________________________________________
neon mailing list
[email protected]
http://mailman.webdav.org/mailman/listinfo/neon
