Author: stas
Date: Wed May 11 16:04:04 2005
New Revision: 169713
URL: http://svn.apache.org/viewcvs?rev=169713&view=rev
Log:
add APR::Status::is_ECONNRESET
Modified:
perl/modperl/trunk/Changes
perl/modperl/trunk/t/protocol/TestProtocol/echo_nonblock.pm
perl/modperl/trunk/xs/APR/Status/APR__Status.h
perl/modperl/trunk/xs/maps/apr_functions.map
Modified: perl/modperl/trunk/Changes
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?rev=169713&r1=169712&r2=169713&view=diff
==============================================================================
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Wed May 11 16:04:04 2005
@@ -12,6 +12,12 @@
=item 1.999_24-dev
+More APR::Status wrappers: [Stas, Randy Kobes]
+- is_EOF
+- is_ECONNABORTED
+- is_ECONNRESET
+- is_TIMEUP
+
make sure that the build picks up the include directories based on the
apxs queries and only search the httpd source if $self->{MP_AP_PREFIX}
was set. Earlier it was always picking the headers from the httpd
Modified: perl/modperl/trunk/t/protocol/TestProtocol/echo_nonblock.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/protocol/TestProtocol/echo_nonblock.pm?rev=169713&r1=169712&r2=169713&view=diff
==============================================================================
--- perl/modperl/trunk/t/protocol/TestProtocol/echo_nonblock.pm (original)
+++ perl/modperl/trunk/t/protocol/TestProtocol/echo_nonblock.pm Wed May 11
16:04:04 2005
@@ -42,8 +42,12 @@
my $buf;
my $len = eval { $socket->recv($buf, BUFF_LEN) };
if ($@) {
+ # rethrow
die $@ unless ref $@ eq 'APR::Error'
- && APR::Status::is_ECONNABORTED($@); # rethrow
+ && (APR::Status::is_ECONNABORTED($@) ||
+ APR::Status::is_ECONNRESET($@));
+ # ECONNABORTED == 103
+ # ECONNRESET == 104
# ECONNABORTED is not an application error
# XXX: we don't really test that we always get this
# condition, since it depends on the timing of the
Modified: perl/modperl/trunk/xs/APR/Status/APR__Status.h
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/xs/APR/Status/APR__Status.h?rev=169713&r1=169712&r2=169713&view=diff
==============================================================================
--- perl/modperl/trunk/xs/APR/Status/APR__Status.h (original)
+++ perl/modperl/trunk/xs/APR/Status/APR__Status.h Wed May 11 16:04:04 2005
@@ -20,4 +20,5 @@
#define mpxs_APR__Status_is_ENOENT APR_STATUS_IS_ENOENT
#define mpxs_APR__Status_is_EOF APR_STATUS_IS_EOF
#define mpxs_APR__Status_is_ECONNABORTED APR_STATUS_IS_ECONNABORTED
+#define mpxs_APR__Status_is_ECONNRESET APR_STATUS_IS_ECONNRESET
#define mpxs_APR__Status_is_TIMEUP APR_STATUS_IS_TIMEUP
Modified: perl/modperl/trunk/xs/maps/apr_functions.map
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/xs/maps/apr_functions.map?rev=169713&r1=169712&r2=169713&view=diff
==============================================================================
--- perl/modperl/trunk/xs/maps/apr_functions.map (original)
+++ perl/modperl/trunk/xs/maps/apr_functions.map Wed May 11 16:04:04 2005
@@ -653,4 +653,5 @@
int:DEFINE_is_ENOENT | | apr_status_t:rc
int:DEFINE_is_EOF | | apr_status_t:rc
int:DEFINE_is_ECONNABORTED | | apr_status_t:rc
+ int:DEFINE_is_ECONNRESET | | apr_status_t:rc
int:DEFINE_is_TIMEUP | | apr_status_t:rc
