Attachment #25156 for bug #42848

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

Lines 52-57 Link Here

(-)httpd-2.3.4-alpha/srclib/apr/include/arch/unix/apr_arch_networkio.h.orig (+3 lines)
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

Lines 99-104 extern "C" { Link Here

(-)httpd-2.3.4-alpha/srclib/apr/include/apr_network_io.h.orig (+2 lines)
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




        return APR_ENOTIMPL;
#endif
        break;
    case APR_SO_IPTOS:
#if defined(HAVE_SOL_IP_H)
# if defined(HAVE_SOL_IP)
        if (setsockopt(sock->socketdes, SOL_IP, IP_TOS, (void *)&on, sizeof(int)) == -1) {
# else
        if (setsockopt(sock->socketdes, IPPROTO_IP, IP_TOS, (void *)&on, sizeof(int)) == -1) {
# endif
            return errno;
        }
#else
        return APR_ENOTIMPL;
#endif
        break;
    default:
        return APR_EINVAL;
    }

Return to bug 42848

Lines 318-323 apr_status_t apr_socket_opt_set(apr_sock Link Here

(-)httpd-2.3.4-alpha/srclib/apr/network_io/unix/sockopt.c.orig (+13 lines)
318	return APR_ENOTIMPL;	318	return APR_ENOTIMPL;
319	#endif	319	#endif
320	break;	320	break;
		321	case APR_SO_IPTOS:
		322	#if defined(HAVE_SOL_IP_H)
		323	# if defined(HAVE_SOL_IP)
		324	if (setsockopt(sock->socketdes, SOL_IP, IP_TOS, (void *)&on, sizeof(int)) == -1) {
		325	# else
		326	if (setsockopt(sock->socketdes, IPPROTO_IP, IP_TOS, (void *)&on, sizeof(int)) == -1) {
		327	# endif
		328	return errno;
		329	}
		330	#else
		331	return APR_ENOTIMPL;
		332	#endif
		333	break;
321	default:	334	default:
322	return APR_EINVAL;	335	return APR_EINVAL;
323	}	336	}