You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by tr...@apache.org on 2014/04/16 01:22:29 UTC
svn commit: r1587750 - in /apr/apr/branches/1.5.x: ./ include/apr_errno.h
Author: trawick
Date: Tue Apr 15 23:22:29 2014
New Revision: 1587750
URL: http://svn.apache.org/r1587750
Log:
Revert the following, since it introduces a new API:
Merge r1561040 from trunk:
Using UDS, we sometime try ops not supported on UDS. Make this
a known (and therfore handable) issue
Modified:
apr/apr/branches/1.5.x/ (props changed)
apr/apr/branches/1.5.x/include/apr_errno.h
Propchange: apr/apr/branches/1.5.x/
------------------------------------------------------------------------------
Reverse-merged /apr/apr/trunk:r1561040
Modified: apr/apr/branches/1.5.x/include/apr_errno.h
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/include/apr_errno.h?rev=1587750&r1=1587749&r2=1587750&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/include/apr_errno.h (original)
+++ apr/apr/branches/1.5.x/include/apr_errno.h Tue Apr 15 23:22:29 2014
@@ -833,13 +833,6 @@ APR_DECLARE(char *) apr_strerror(apr_sta
#define APR_EAFNOSUPPORT (APR_OS_START_CANONERR + 27)
#endif
-/** @see APR_STATUS_IS_EOPNOTSUPP */
-#ifdef EOPNOTSUPP
-#define APR_EOPNOTSUPP EOPNOTSUPP
-#else
-#define APR_EOPNOTSUPP (APR_OS_START_CANONERR + 28)
-#endif
-
/** @} */
#if defined(OS2) && !defined(DOXYGEN)
@@ -984,8 +977,6 @@ APR_DECLARE(char *) apr_strerror(apr_sta
|| (s) == APR_OS_START_SYSERR + ERROR_ACCESS_DENIED)
#define APR_STATUS_IS_EAFNOSUPPORT(s) ((s) == APR_AFNOSUPPORT \
|| (s) == APR_OS_START_SYSERR + SOCEAFNOSUPPORT)
-#define APR_STATUS_IS_EOPNOTSUPP(s) ((s) == APR_EOPNOTSUPP \
- || (s) == APR_OS_START_SYSERR + SOCEOPNOTSUPP)
/*
Sorry, too tired to wrap this up for OS2... feel free to
@@ -999,6 +990,7 @@ APR_DECLARE(char *) apr_strerror(apr_sta
{ SOCENOPROTOOPT, ENOPROTOOPT },
{ SOCEPROTONOSUPPORT, EPROTONOSUPPORT },
{ SOCESOCKTNOSUPPORT, ESOCKTNOSUPPORT },
+ { SOCEOPNOTSUPP, EOPNOTSUPP },
{ SOCEPFNOSUPPORT, EPFNOSUPPORT },
{ SOCEADDRINUSE, EADDRINUSE },
{ SOCEADDRNOTAVAIL, EADDRNOTAVAIL },
@@ -1130,8 +1122,6 @@ APR_DECLARE(char *) apr_strerror(apr_sta
|| (s) == APR_OS_START_SYSERR + ERROR_DIR_NOT_EMPTY)
#define APR_STATUS_IS_EAFNOSUPPORT(s) ((s) == APR_EAFNOSUPPORT \
|| (s) == APR_OS_START_SYSERR + WSAEAFNOSUPPORT)
-#define APR_STATUS_IS_EOPNOTSUPP(s) ((s) == APR_EOPNOTSUPP \
- || (s) == APR_OS_START_SYSERR + WSAEOPNOTSUPP)
#elif defined(NETWARE) && defined(USE_WINSOCK) && !defined(DOXYGEN) /* !defined(OS2) && !defined(WIN32) */
@@ -1193,8 +1183,6 @@ APR_DECLARE(char *) apr_strerror(apr_sta
#define APR_STATUS_IS_ENOTEMPTY(s) ((s) == APR_ENOTEMPTY)
#define APR_STATUS_IS_EAFNOSUPPORT(s) ((s) == APR_EAFNOSUPPORT \
|| (s) == APR_OS_START_SYSERR + WSAEAFNOSUPPORT)
-#define APR_STATUS_IS_EOPNOTSUPP(s) ((s) == APR_EOPNOTSUPP \
- || (s) == APR_OS_START_SYSERR + WSAEOPNOTSUPP)
#else /* !defined(NETWARE) && !defined(OS2) && !defined(WIN32) */
@@ -1314,8 +1302,6 @@ APR_DECLARE(char *) apr_strerror(apr_sta
(s) == APR_EEXIST)
/** Address Family not supported */
#define APR_STATUS_IS_EAFNOSUPPORT(s) ((s) == APR_EAFNOSUPPORT)
-/** Socket operation not supported */
-#define APR_STATUS_IS_EOPNOTSUPP(s) ((s) == APR_EOPNOTSUPP)
/** @} */
#endif /* !defined(NETWARE) && !defined(OS2) && !defined(WIN32) */
Re: svn commit: r1587750 - in /apr/apr/branches/1.5.x: ./ include/apr_errno.h
Posted by Jeff Trawick <tr...@gmail.com>.
On Fri, Apr 25, 2014 at 7:30 AM, Graham Leggett <mi...@sharp.fm> wrote:
> On 25 Apr 2014, at 12:40 PM, Jeff Trawick <tr...@gmail.com> wrote:
>
> Would you like to apply this to v1.6?
>>
>
> Not personally... I don't recall the use case, only that it didn't belong
> in 1.5.x.
>
> You should maintain the 1.6.x branch until others on their own terms find
> a compelling reason to help out.
>
>
> Our branch process is documented under "branch maintenance" at
> http://apr.apache.org/guidelines.html, please ensure you comply with
> it. There is no precedence in this project for assigning the responsibility
> for maintaining a higher branch to one person, and we certainly shouldn't
> be doing this kind of thing, ever.
>
You should be willing to do the work that you created for the project
instead of asking everyone else to do so.
--
Born in Roswell... married an alien...
http://emptyhammock.com/
http://edjective.org/
Re: svn commit: r1587750 - in /apr/apr/branches/1.5.x: ./ include/apr_errno.h
Posted by Graham Leggett <mi...@sharp.fm>.
On 25 Apr 2014, at 12:40 PM, Jeff Trawick <tr...@gmail.com> wrote:
> Would you like to apply this to v1.6?
>
> Not personally... I don't recall the use case, only that it didn't belong in 1.5.x.
>
> You should maintain the 1.6.x branch until others on their own terms find a compelling reason to help out.
Our branch process is documented under "branch maintenance" at http://apr.apache.org/guidelines.html, please ensure you comply with it. There is no precedence in this project for assigning the responsibility for maintaining a higher branch to one person, and we certainly shouldn't be doing this kind of thing, ever.
Regards,
Graham
--
Re: svn commit: r1587750 - in /apr/apr/branches/1.5.x: ./ include/apr_errno.h
Posted by Jeff Trawick <tr...@gmail.com>.
On Fri, Apr 25, 2014 at 6:36 AM, Graham Leggett <mi...@sharp.fm> wrote:
> On 16 Apr 2014, at 1:22 AM, trawick@apache.org wrote:
>
> > Author: trawick
> > Date: Tue Apr 15 23:22:29 2014
> > New Revision: 1587750
> >
> > URL: http://svn.apache.org/r1587750
> > Log:
> > Revert the following, since it introduces a new API:
> >
> > Merge r1561040 from trunk:
> >
> > Using UDS, we sometime try ops not supported on UDS. Make this
> > a known (and therfore handable) issue
> >
> > Modified:
> > apr/apr/branches/1.5.x/ (props changed)
> > apr/apr/branches/1.5.x/include/apr_errno.h
>
> Would you like to apply this to v1.6?
>
Not personally... I don't recall the use case, only that it didn't belong
in 1.5.x.
You should maintain the 1.6.x branch until others on their own terms find a
compelling reason to help out.
--
Born in Roswell... married an alien...
http://emptyhammock.com/
http://edjective.org/
Re: svn commit: r1587750 - in /apr/apr/branches/1.5.x: ./ include/apr_errno.h
Posted by Graham Leggett <mi...@sharp.fm>.
On 16 Apr 2014, at 1:22 AM, trawick@apache.org wrote:
> Author: trawick
> Date: Tue Apr 15 23:22:29 2014
> New Revision: 1587750
>
> URL: http://svn.apache.org/r1587750
> Log:
> Revert the following, since it introduces a new API:
>
> Merge r1561040 from trunk:
>
> Using UDS, we sometime try ops not supported on UDS. Make this
> a known (and therfore handable) issue
>
> Modified:
> apr/apr/branches/1.5.x/ (props changed)
> apr/apr/branches/1.5.x/include/apr_errno.h
Would you like to apply this to v1.6?
Regards,
Graham
--