You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by tr...@apache.org on 2013/10/21 14:02:14 UTC
svn commit: r1534114 - in /apr/apr/branches/1.5.x: ./
include/apr_network_io.h
Author: trawick
Date: Mon Oct 21 12:02:14 2013
New Revision: 1534114
URL: http://svn.apache.org/r1534114
Log:
merge r1460241 from trunk:
add a warning about thread safety
Submitted by: sf
Modified:
apr/apr/branches/1.5.x/ (props changed)
apr/apr/branches/1.5.x/include/apr_network_io.h
Propchange: apr/apr/branches/1.5.x/
------------------------------------------------------------------------------
Merged /apr/apr/trunk:r1460241
Modified: apr/apr/branches/1.5.x/include/apr_network_io.h
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/include/apr_network_io.h?rev=1534114&r1=1534113&r2=1534114&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/include/apr_network_io.h (original)
+++ apr/apr/branches/1.5.x/include/apr_network_io.h Mon Oct 21 12:02:14 2013
@@ -280,6 +280,9 @@ struct apr_hdtr_t {
* @param type The type of the socket (e.g., SOCK_STREAM).
* @param protocol The protocol of the socket (e.g., APR_PROTO_TCP).
* @param cont The pool for the apr_socket_t and associated storage.
+ * @note The pool will be used by various functions that operate on the
+ * socket. The caller must ensure that it is not used by other threads
+ * at the same time.
*/
APR_DECLARE(apr_status_t) apr_socket_create(apr_socket_t **new_sock,
int family, int type,
@@ -335,6 +338,9 @@ APR_DECLARE(apr_status_t) apr_socket_lis
* be used for all future communication.
* @param sock The socket we are listening on.
* @param connection_pool The pool for the new socket.
+ * @note The pool will be used by various functions that operate on the
+ * socket. The caller must ensure that it is not used by other threads
+ * at the same time.
*/
APR_DECLARE(apr_status_t) apr_socket_accept(apr_socket_t **new_sock,
apr_socket_t *sock,