Author: torsten
Date: Mon Apr 19 11:07:12 2010
New Revision: 935523
URL: http://svn.apache.org/viewvc?rev=935523&view=rev
Log:
Merged revisions 935519 via svnmerge from
https://svn.eu.apache.org/repos/asf/perl/modperl/trunk
........
r935519 | torsten | 2010-04-19 12:43:15 +0200 (Mon, 19 Apr 2010) | 1 line
make the UNIX-level file descriptor of an APR::Socket available
........
Modified:
perl/modperl/branches/threading/ (props changed)
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 Mon Apr 19 11:07:12 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
+/perl/modperl/trunk:594682-672484,672819-681118,693357,700369,732889-736218,751909-752425,757553-774171,807116,807332-807649,907778-932879,933373-933563,935519
Propchange: perl/modperl/branches/threading/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Apr 19 11:07:12 2010
@@ -1 +1 @@
-/perl/modperl/trunk:1-712967,712969-933563
+/perl/modperl/trunk:1-712967,712969-935521
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=935523&r1=935522&r2=935523&view=diff
==============================================================================
--- perl/modperl/branches/threading/t/response/TestAPR/socket.pm (original)
+++ perl/modperl/branches/threading/t/response/TestAPR/socket.pm Mon Apr 19
11:07:12 2010
@@ -19,7 +19,7 @@ use APR::Const -compile => 'EMISMATCH';
sub handler {
my $r = shift;
- my $tests = 4;
+ my $tests = 5;
plan $r, tests => $tests;
@@ -41,6 +41,15 @@ sub handler {
$socket->timeout_set($orig_val);
ok t_cmp($socket->timeout_get(), $orig_val, "timeout_get()");
+ my $fd=$socket->sock_get;
+ t_debug "client socket fd=$fd";
+ if ($^O eq 'MSWin32') {
+ ok $fd==-1;
+ }
+ else {
+ ok $fd>=0;
+ }
+
Apache2::Const::OK;
}
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=935523&r1=935522&r2=935523&view=diff
==============================================================================
--- perl/modperl/branches/threading/xs/APR/Socket/APR__Socket.h (original)
+++ perl/modperl/branches/threading/xs/APR/Socket/APR__Socket.h Mon Apr 19
11:07:12 2010
@@ -117,6 +117,17 @@ 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)
+{
+#ifdef WIN32
+ return -1; /* not implemented */
+#else
+ apr_os_sock_t s;
+ apr_os_sock_get(&s, sock);
+ return s;
+#endif
+}
+
/*
* Local Variables:
* c-basic-offset: 4
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=935523&r1=935522&r2=935523&view=diff
==============================================================================
--- perl/modperl/branches/threading/xs/maps/apr_functions.map (original)
+++ perl/modperl/branches/threading/xs/maps/apr_functions.map Mon Apr 19
11:07:12 2010
@@ -55,6 +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
MODULE=APR::Socket
apr_socket_close
@@ -626,7 +627,7 @@ MODULE=APR::OS
-apr_os_exp_time_get
-apr_os_file_get
-apr_os_imp_time_get
--apr_os_sock_get
+~apr_os_sock_get
-apr_os_thread_get
-apr_os_threadkey_get
-apr_os_sock_make
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=935523&r1=935522&r2=935523&view=diff
==============================================================================
--- perl/modperl/branches/threading/xs/tables/current/ModPerl/FunctionTable.pm
(original)
+++ perl/modperl/branches/threading/xs/tables/current/ModPerl/FunctionTable.pm
Mon Apr 19 11:07:12 2010
@@ -5992,6 +5992,24 @@ $ModPerl::FunctionTable = [
]
},
{
+ 'return_type' => 'int',
+ 'name' => 'mpxs_APR__Socket_sock_get',
+ 'attr' => [
+ 'static',
+ '__inline__'
+ ],
+ 'args' => [
+ {
+ 'type' => 'PerlInterpreter *',
+ 'name' => 'my_perl'
+ },
+ {
+ 'type' => 'apr_socket_t *',
+ 'name' => 'socket'
+ }
+ ]
+ },
+ {
'return_type' => 'SV *',
'name' => 'mpxs_APR__String_strfsize',
'args' => [
