View | Details | Raw Unified | Return to bug 42848
Collapse All | Expand All

(-)httpd-2.3.4-alpha/srclib/apr/include/arch/unix/apr_arch_networkio.h.orig (+3 lines)
Lines 52-57 Link Here
52
#if APR_HAVE_NETINET_TCP_H
52
#if APR_HAVE_NETINET_TCP_H
53
#include <netinet/tcp.h>
53
#include <netinet/tcp.h>
54
#endif
54
#endif
55
#if APR_HAVE_NETINET_IP_H
56
#include <netinet/ip.h>
57
#endif
55
#if APR_HAVE_NETINET_SCTP_UIO_H
58
#if APR_HAVE_NETINET_SCTP_UIO_H
56
#include <netinet/sctp_uio.h>
59
#include <netinet/sctp_uio.h>
57
#endif
60
#endif
(-)httpd-2.3.4-alpha/srclib/apr/include/apr.h.in.orig (+1 lines)
Lines 80-85 Link Here
80
#define APR_HAVE_LIMITS_H        @limitsh@
80
#define APR_HAVE_LIMITS_H        @limitsh@
81
#define APR_HAVE_NETDB_H         @netdbh@
81
#define APR_HAVE_NETDB_H         @netdbh@
82
#define APR_HAVE_NETINET_IN_H    @netinet_inh@
82
#define APR_HAVE_NETINET_IN_H    @netinet_inh@
83
#define APR_HAVE_NETINET_IP_H    @netinet_iph@
83
#define APR_HAVE_NETINET_SCTP_H  @netinet_sctph@
84
#define APR_HAVE_NETINET_SCTP_H  @netinet_sctph@
84
#define APR_HAVE_NETINET_SCTP_UIO_H @netinet_sctp_uioh@
85
#define APR_HAVE_NETINET_SCTP_UIO_H @netinet_sctp_uioh@
85
#define APR_HAVE_NETINET_TCP_H   @netinet_tcph@
86
#define APR_HAVE_NETINET_TCP_H   @netinet_tcph@
(-)httpd-2.3.4-alpha/srclib/apr/include/apr_network_io.h.orig (+2 lines)
Lines 99-104 extern "C" { Link Here
99
                                    * until data is available.
99
                                    * until data is available.
100
                                    * @see apr_socket_accept_filter
100
                                    * @see apr_socket_accept_filter
101
                                    */
101
                                    */
102
#define APR_SO_IPTOS         65536 /**< Set IP ToS markings on traffic.
103
                                    */
102
104
103
/** @} */
105
/** @} */
104
106
(-)httpd-2.3.4-alpha/srclib/apr/configure.in.orig (+2 lines)
Lines 1392-1397 APR_FLAG_HEADERS( Link Here
1392
    kernel/OS.h		\
1392
    kernel/OS.h		\
1393
    net/errno.h		\
1393
    net/errno.h		\
1394
    netinet/in.h	\
1394
    netinet/in.h	\
1395
    netinet/ip.h	\
1395
    netinet/sctp.h      \
1396
    netinet/sctp.h      \
1396
    netinet/sctp_uio.h  \
1397
    netinet/sctp_uio.h  \
1397
    sys/file.h		\
1398
    sys/file.h		\
Lines 1444-1449 AC_SUBST(limitsh) Link Here
1444
AC_SUBST(netdbh)
1445
AC_SUBST(netdbh)
1445
AC_SUBST(sys_syslimitsh)
1446
AC_SUBST(sys_syslimitsh)
1446
AC_SUBST(netinet_inh)
1447
AC_SUBST(netinet_inh)
1448
AC_SUBST(netinet_iph)
1447
AC_SUBST(netinet_sctph)
1449
AC_SUBST(netinet_sctph)
1448
AC_SUBST(netinet_sctp_uioh)
1450
AC_SUBST(netinet_sctp_uioh)
1449
AC_SUBST(netinet_tcph)
1451
AC_SUBST(netinet_tcph)
(-)httpd-2.3.4-alpha/srclib/apr/network_io/unix/sockopt.c.orig (+12 lines)
Lines 17-22 Link Here
17
#include "apr_arch_networkio.h"
17
#include "apr_arch_networkio.h"
18
#include "apr_strings.h"
18
#include "apr_strings.h"
19
19
20
#if !defined(SOL_IP)
21
#define SOL_IP IPPROTO_IP
22
#endif
20
23
21
static apr_status_t soblock(int sd)
24
static apr_status_t soblock(int sd)
22
{
25
{
Lines 318-323 apr_status_t apr_socket_opt_set(apr_sock Link Here
318
        return APR_ENOTIMPL;
321
        return APR_ENOTIMPL;
319
#endif
322
#endif
320
        break;
323
        break;
324
    case APR_SO_IPTOS:
325
#if defined(IP_TOS)
326
        if (setsockopt(sock->socketdes, SOL_IP, IP_TOS, (void *)&on, sizeof(int)) == -1) {
327
            return errno;
328
        }
329
#else
330
        return APR_ENOTIMPL;
331
#endif
332
        break;
321
    default:
333
    default:
322
        return APR_EINVAL;
334
        return APR_EINVAL;
323
    }
335
    }

Return to bug 42848