Merge pull request #687 in FS/freeswitch from freetdm_patch to master

* commit '320d5f2015976fed9ca282dfeeb2bd3e977e6f76':
  Applied the Sangoma patch to FS version 1.2 in order to port to FS v1.6+

libs/apr/include/apr_network_io.h

@@ -631,6 +631,13 @@ APR_DECLARE(apr_status_t) apr_socket_timeout_set(apr_socket_t *sock,
 APR_DECLARE(apr_status_t) apr_socket_opt_get(apr_socket_t *sock, 
                                              apr_int32_t opt, apr_int32_t *on);
 
+/**
+ * Get Socket fd for the socket passed
+ * @param sock The socket to quesry for the socket fd
+ */
+APR_DECLARE(int) apr_socket_fd_get(apr_socket_t *sock);
+
+
 /**
  * Query socket timeout for the specified socket
  * @param sock The socket to query

libs/apr/network_io/os2/sockopt.c

@@ -110,6 +110,16 @@ APR_DECLARE(apr_status_t) apr_socket_opt_get(apr_socket_t *sock,
 }
 
 
+APR_DECLARE(int) apr_socket_fd_get(apr_socket_t *sock)
+{
+	if (sock) {
+		return sock->socketdes;
+	} else {
+		return 0;
+	}
+}
+
+
 APR_DECLARE(apr_status_t) apr_socket_atmark(apr_socket_t *sock, int *atmark)
 {
     int oobmark;

libs/apr/network_io/unix/sockopt.c

@@ -344,6 +344,16 @@ apr_status_t apr_socket_opt_get(apr_socket_t *sock,
 }
 
 
+int apr_socket_fd_get(apr_socket_t *sock)
+{
+	if (sock) {
+		return sock->socketdes;
+	} else {
+		return 0;
+	}
+}
+
+
 apr_status_t apr_socket_atmark(apr_socket_t *sock, int *atmark)
 {
 #ifndef BEOS_R5

libs/apr/network_io/win32/sockopt.c

@@ -244,6 +244,16 @@ APR_DECLARE(apr_status_t) apr_socket_opt_get(apr_socket_t *sock,
 }
 
 
+APR_DECLARE(int) apr_socket_fd_get(apr_socket_t *sock)
+{
+	if (sock) {
+		return sock->socketdes;
+	} else {
+		return 0;
+	}
+}
+
+
 APR_DECLARE(apr_status_t) apr_socket_atmark(apr_socket_t *sock, int *atmark)
 {
     u_long oobmark;