Author: torsten
Date: Thu Apr 22 08:07:31 2010
New Revision: 936643
URL: http://svn.apache.org/viewvc?rev=936643&view=rev
Log:
rename APR::Socket::sock_get to APR::Socket::fileno
Modified:
perl/modperl/trunk/Changes
perl/modperl/trunk/t/response/TestAPR/socket.pm
perl/modperl/trunk/xs/APR/Socket/APR__Socket.h
perl/modperl/trunk/xs/maps/apr_functions.map
perl/modperl/trunk/xs/tables/current/ModPerl/FunctionTable.pm
Modified: perl/modperl/trunk/Changes
URL:
http://svn.apache.org/viewvc/perl/modperl/trunk/Changes?rev=936643&r1=936642&r2=936643&view=diff
==============================================================================
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Thu Apr 22 08:07:31 2010
@@ -12,6 +12,8 @@ Also refer to the Apache::Test changes l
=item 2.0.5-dev
+Implement APR::Socket::fileno [Torsten Foertsch]
+
Export PROXYREQ_RESPONSE, a missing PROXYREQ_* constant [Gozer]
Make sure standard file descriptors are preserved by the perl-script
Modified: perl/modperl/trunk/t/response/TestAPR/socket.pm
URL:
http://svn.apache.org/viewvc/perl/modperl/trunk/t/response/TestAPR/socket.pm?rev=936643&r1=936642&r2=936643&view=diff
==============================================================================
--- perl/modperl/trunk/t/response/TestAPR/socket.pm (original)
+++ perl/modperl/trunk/t/response/TestAPR/socket.pm Thu Apr 22 08:07:31 2010
@@ -40,7 +40,7 @@ sub handler {
$socket->timeout_set($orig_val);
ok t_cmp($socket->timeout_get(), $orig_val, "timeout_get()");
- my $fd=$socket->sock_get;
+ my $fd=$socket->fileno;
t_debug "client socket fd=$fd";
if ($^O eq 'MSWin32') {
ok $fd==-1;
Modified: perl/modperl/trunk/xs/APR/Socket/APR__Socket.h
URL:
http://svn.apache.org/viewvc/perl/modperl/trunk/xs/APR/Socket/APR__Socket.h?rev=936643&r1=936642&r2=936643&view=diff
==============================================================================
--- perl/modperl/trunk/xs/APR/Socket/APR__Socket.h (original)
+++ perl/modperl/trunk/xs/APR/Socket/APR__Socket.h Thu Apr 22 08:07:31 2010
@@ -117,7 +117,7 @@ apr_status_t mpxs_APR__Socket_poll(apr_s
return apr_poll(&fd, 1, &nsds, timeout);
}
-static MP_INLINE int mpxs_APR__Socket_sock_get(pTHX_ apr_socket_t *sock)
+static MP_INLINE int mpxs_APR__Socket_fileno(pTHX_ apr_socket_t *sock)
{
#ifdef WIN32
return -1; /* not implemented */
Modified: perl/modperl/trunk/xs/maps/apr_functions.map
URL:
http://svn.apache.org/viewvc/perl/modperl/trunk/xs/maps/apr_functions.map?rev=936643&r1=936642&r2=936643&view=diff
==============================================================================
--- perl/modperl/trunk/xs/maps/apr_functions.map (original)
+++ perl/modperl/trunk/xs/maps/apr_functions.map Thu Apr 22 08:07:31 2010
@@ -55,7 +55,7 @@ MODULE=APR::Socket
!apr_socket_shutdown
-apr_socket_inherit_set
-apr_socket_inherit_unset
- mpxs_APR__Socket_sock_get | | apr_socket_t *:socket
+ mpxs_APR__Socket_fileno | | apr_socket_t *:socket
MODULE=APR::Socket
apr_socket_close
Modified: perl/modperl/trunk/xs/tables/current/ModPerl/FunctionTable.pm
URL:
http://svn.apache.org/viewvc/perl/modperl/trunk/xs/tables/current/ModPerl/FunctionTable.pm?rev=936643&r1=936642&r2=936643&view=diff
==============================================================================
--- perl/modperl/trunk/xs/tables/current/ModPerl/FunctionTable.pm (original)
+++ perl/modperl/trunk/xs/tables/current/ModPerl/FunctionTable.pm Thu Apr 22
08:07:31 2010
@@ -5982,7 +5982,7 @@ $ModPerl::FunctionTable = [
},
{
'return_type' => 'int',
- 'name' => 'mpxs_APR__Socket_sock_get',
+ 'name' => 'mpxs_APR__Socket_fileno',
'attr' => [
'static',
'__inline__'
