stas 2004/04/07 16:44:21
Modified: t/protocol/TestProtocol echo.pm . Changes Log: make sure that our protocol module tests that interact with the socket use a blocking read Submitted by: Joe Orton Revision Changes Path 1.3 +6 -0 modperl-2.0/t/protocol/TestProtocol/echo.pm Index: echo.pm =================================================================== RCS file: /home/cvs/modperl-2.0/t/protocol/TestProtocol/echo.pm,v retrieving revision 1.2 retrieving revision 1.3 diff -u -u -r1.2 -r1.3 --- echo.pm 11 Apr 2002 11:08:43 -0000 1.2 +++ echo.pm 7 Apr 2004 23:44:21 -0000 1.3 @@ -7,6 +7,7 @@ use APR::Socket (); use Apache::Const -compile => 'OK'; +use APR::Const -compile => qw(:socket); use constant BUFF_LEN => 1024; @@ -15,6 +16,11 @@ my APR::Socket $socket = $c->client_socket; my $buff; + + # make sure the socket is in the blocking mode for recv(). + # on some platforms (e.g. OSX/Solaris) httpd hands us a + # non-blocking socket + $socket->opt_set(APR::SO_NONBLOCK, 0); for (;;) { my($rlen, $wlen); 1.357 +3 -0 modperl-2.0/Changes Index: Changes =================================================================== RCS file: /home/cvs/modperl-2.0/Changes,v retrieving revision 1.356 retrieving revision 1.357 diff -u -u -r1.356 -r1.357 --- Changes 5 Apr 2004 04:38:29 -0000 1.356 +++ Changes 7 Apr 2004 23:44:21 -0000 1.357 @@ -12,6 +12,9 @@ =item 1.99_14-dev +make sure that our protocol module tests that interact with the socket +use a blocking read [Joe Orton] + Use a better approach to figure out whether we need to strip perl's LargeFilesSource flag, by checking whether libapr was compiled with -D_FILE_OFFSET_BITS=64 or not. Checking for APR_HAS_LARGE_FILES is