]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge r473278 from trunk:
authorJim Jagielski <jim@apache.org>
Tue, 8 May 2007 18:25:52 +0000 (18:25 +0000)
committerJim Jagielski <jim@apache.org>
Tue, 8 May 2007 18:25:52 +0000 (18:25 +0000)
commit519fedd8123589206ac16576582cb79c5fdb06a9
tree1031e36bec30146d40a71b747b796dc44c039251
parent841a5d56cf3219cf49df598ac9208cb84b215733
Merge r473278 from trunk:

Add alternate is_socket_connected by using APR functions.
Submitted by: mturk
Reviewed by: jim

Merge r535354 from trunk:

Abstract out (kinda) MSG_PEEK. This way when we
actually update APR and apr_socket_recvfrom()
to know about APR_MSG_OOB, APR_MSG_PEEK, etc...
this code won't need to be adjusted. Also,
make nicer for 2.2 backport.

Reviewed by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@536291 13f79535-47bb-0310-9956-ffa450edef68
STATUS
modules/proxy/proxy_util.c