head	1.2;
access;
symbols
	RELEASE_8_3_0:1.1;
locks; strict;
comment	@# @;


1.2
date	2012.05.31.17.38.58;	author mm;	state dead;
branches;
next	1.1;

1.1
date	2012.03.19.09.18.13;	author mm;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Update to 1.4.31
@
text
@Index: src/server.c
===================================================================
--- src/server.c	(revision 2823)
+++ src/server.c	(revision 2824)
@@@@ -409,19 +409,31 @@@@
       "\t- libev (generic)\n"
 #endif
       "\nNetwork handler:\n\n"
-#if defined(USE_LINUX_SENDFILE) || defined(USE_FREEBSD_SENDFILE) || defined(USE_SOLARIS_SENDFILEV) || defined(USE_AIX_SENDFILE)
-      "\t+ sendfile\n"
+#if defined USE_LINUX_SENDFILE
+      "\t+ linux-sendfile\n"
 #else
-  #ifdef USE_WRITEV
+      "\t- linux-sendfile\n"
+#endif
+#if defined USE_FREEBSD_SENDFILE
+      "\t+ freebsd-sendfile\n"
+#else
+      "\t- freebsd-sendfile\n"
+#endif
+#if defined USE_SOLARIS_SENDFILEV
+      "\t+ solaris-sendfilev\n"
+#else
+      "\t- solaris-sendfilev\n"
+#endif
+#if defined USE_WRITEV
       "\t+ writev\n"
-  #else
+#else
+      "\t- writev\n"
+#endif
       "\t+ write\n"
-  #endif
-  #ifdef USE_MMAP
+#ifdef USE_MMAP
       "\t+ mmap support\n"
-  #else
+#else
       "\t- mmap support\n"
-  #endif
 #endif
       "\nFeatures:\n\n"
 #ifdef HAVE_IPV6
@


1.1
log
@Add patch for upstream bug #2391
Reorganize patches

Feature safe:	yes
@
text
@@

