Merge r727052 from trunk: * Similar to apr_strtoff reset errno to zero in apr_strtoi64. Cases were observed where apr_strtoi64 returned with a previously set errno although the operation worked fine. Submitted by: rpluem Reviewed by: rpluem Index: strings/apr_strings.c =================================================================== --- strings/apr_strings.c (revision 647686) +++ strings/apr_strings.c (revision 727605) @@ -245,6 +245,7 @@ APR_DECLARE(apr_int64_t) apr_strtoi64(const char *nptr, char **endptr, int base) { #ifdef APR_INT64_STRFN + errno = 0; return APR_INT64_STRFN(nptr, endptr, base); #else const char *s; @@ -253,6 +254,7 @@ int neg, any; char c; + errno = 0; /* * Skip white space and pick up leading +/- sign if any. * If base is 0, allow 0x for hex and 0 for octal, else