Author: torsten
Date: Thu Apr 22 08:32:23 2010
New Revision: 936650
URL: http://svn.apache.org/viewvc?rev=936650&view=rev
Log:
Merged revisions 936643 via svnmerge from
https://svn.eu.apache.org/repos/asf/perl/modperl/trunk
........
r936643 | torsten | 2010-04-22 10:07:31 +0200 (Thu, 22 Apr 2010) | 1 line
rename APR::Socket::sock_get to APR::Socket::fileno
........
Modified:
perl/modperl/branches/threading/ (props changed)
perl/modperl/branches/threading/Changes
perl/modperl/branches/threading/t/response/TestAPR/socket.pm
perl/modperl/branches/threading/xs/APR/Socket/APR__Socket.h
perl/modperl/branches/threading/xs/maps/apr_functions.map
perl/modperl/branches/threading/xs/tables/current/ModPerl/FunctionTable.pm
Propchange: perl/modperl/branches/threading/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 22 08:32:23 2010
@@ -1 +1 @@
-/perl/modperl/trunk:594682-672484,672819-681118,693357,700369,732889-736218,751909-752425,757553-774171,807116,807332-807649,907778-932879,933373-933563,935519
+/perl/modperl/trunk:594682-672484,672819-681118,693357,700369,732889-736218,751909-752425,757553-774171,807116,807332-807649,907778-932879,933373-933563,935519,936643
Propchange: perl/modperl/branches/threading/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Apr 22 08:32:23 2010
@@ -1 +1 @@
-/perl/modperl/trunk:1-712967,712969-935521
+/perl/modperl/trunk:1-712967,712969-936647
Modified: perl/modperl/branches/threading/Changes
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/threading/Changes?rev=936650&r1=936649&r2=936650&view=diff
==============================================================================
--- perl/modperl/branches/threading/Changes (original)
+++ perl/modperl/branches/threading/Changes Thu Apr 22 08:32:23 2010
@@ -31,6 +31,8 @@ Expose modperl_interp_t via ModPerl::Int
=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/branches/threading/t/response/TestAPR/socket.pm
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/threading/t/response/TestAPR/socket.pm?rev=936650&r1=936649&r2=936650&view=diff
==============================================================================
--- perl/modperl/branches/threading/t/response/TestAPR/socket.pm (original)
+++ perl/modperl/branches/threading/t/response/TestAPR/socket.pm Thu Apr 22
08:32:23 2010
@@ -41,7 +41,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/branches/threading/xs/APR/Socket/APR__Socket.h
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/threading/xs/APR/Socket/APR__Socket.h?rev=936650&r1=936649&r2=936650&view=diff
==============================================================================
--- perl/modperl/branches/threading/xs/APR/Socket/APR__Socket.h (original)
+++ perl/modperl/branches/threading/xs/APR/Socket/APR__Socket.h Thu Apr 22
08:32:23 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/branches/threading/xs/maps/apr_functions.map
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/threading/xs/maps/apr_functions.map?rev=936650&r1=936649&r2=936650&view=diff
==============================================================================
--- perl/modperl/branches/threading/xs/maps/apr_functions.map (original)
+++ perl/modperl/branches/threading/xs/maps/apr_functions.map Thu Apr 22
08:32:23 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/branches/threading/xs/tables/current/ModPerl/FunctionTable.pm
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/threading/xs/tables/current/ModPerl/FunctionTable.pm?rev=936650&r1=936649&r2=936650&view=diff
==============================================================================
--- perl/modperl/branches/threading/xs/tables/current/ModPerl/FunctionTable.pm
(original)
+++ perl/modperl/branches/threading/xs/tables/current/ModPerl/FunctionTable.pm
Thu Apr 22 08:32:23 2010
@@ -5993,7 +5993,7 @@ $ModPerl::FunctionTable = [
},
{
'return_type' => 'int',
- 'name' => 'mpxs_APR__Socket_sock_get',
+ 'name' => 'mpxs_APR__Socket_fileno',
'attr' => [
'static',
'__inline__'
