← Back to branch summary

~ubuntu-branches/ubuntu/feisty/apache2/feisty

« back to all changes in this revision

Viewing changes to debian/patches/014_unfuck_sctp

  • Committer: Bazaar Package Importer
  • Author(s): Andreas Barth
  • Date: 2006-12-09 21:05:45 UTC
  • mfrom: (0.6.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20061209210545-h70s0xaqc2v8vqr2
Tags: 2.2.3-3.2
http://bugs.debian.org/396265
* Non-maintainer upload.
* 043_ajp_connection_reuse: Patch from upstream Bugzilla, fixing a critical
  issue with regard to connection reuse in mod_proxy_ajp.
  Closes: #396265

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/014_unfuck_sctp
1
 
diff -ur build-tree/apache2/srclib/apr/network_io/unix/sockopt.c bak/apache2/srclib/apr/network_io/unix/sockopt.c
2
 
--- build-tree/apache2/srclib/apr/network_io/unix/sockopt.c     2004-02-27 15:05:15.000000000 +0000
3
 
+++ bak/apache2/srclib/apr/network_io/unix/sockopt.c    2004-04-04 11:59:53.000000000 +0100
4
 
@@ -210,7 +210,7 @@
5
 
             int optlevel = IPPROTO_TCP;
6
 
             int optname = TCP_NODELAY;
7
 
 
8
 
-#if APR_HAVE_SCTP
9
 
+#if APR_HAVE_SCTP && defined(SCTP_NODELAY)
10
 
             if (sock->protocol == IPPROTO_SCTP) {
11
 
                 optlevel = IPPROTO_SCTP;
12
 
                 optname = SCTP_NODELAY;
13
 
@@ -240,7 +240,7 @@
14
 
             int optlevel = IPPROTO_TCP;
15
 
             int optname = TCP_NODELAY;
16
 
 
17
 
-#if APR_HAVE_SCTP
18
 
+#if APR_HAVE_SCTP && defined(SCTP_NODELAY)
19
 
             if (sock->protocol == IPPROTO_SCTP) {
20
 
                 optlevel = IPPROTO_SCTP;
21
 
                 optname = SCTP_NODELAY;