Re: svn commit: r1451633 - in /httpd/httpd/trunk: include/ap_mmn.h modules/proxy/mod_proxy.h modules/proxy/proxy_util.c
Le 01/03/2013 17:21, j...@apache.org a écrit : Author: jim Date: Fri Mar 1 16:21:49 2013 New Revision: 1451633 URL: http://svn.apache.org/r1451633 Log: Add in rough uds support (Bugx 54101) from Blaise Tarr blaise.t...@gmail.com Modified: httpd/httpd/trunk/include/ap_mmn.h httpd/httpd/trunk/modules/proxy/mod_proxy.h httpd/httpd/trunk/modules/proxy/proxy_util.c Modified: httpd/httpd/trunk/modules/proxy/proxy_util.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/proxy_util.c?rev=1451633r1=1451632r2=1451633view=diff == --- httpd/httpd/trunk/modules/proxy/proxy_util.c (original) +++ httpd/httpd/trunk/modules/proxy/proxy_util.c Fri Mar 1 16:21:49 2013 @@ -31,6 +31,11 @@ #define apr_socket_create apr_socket_create_ex #endif +#if APR_HAVE_SYS_UN_H +#include sys/un.h +#endif +#include apr_support.h/* for apr_wait_for_io_or_timeout() */ + APLOG_USE_MODULE(proxy); This break build with APR trunk with : proxy_util.c:37:71: fatal error: apr_support.h: No such file or directory because, on APR trunk, apr_support.h is in include/private Not an issue for now, one should not use APR trunk for building, but could become one in the future. Best regards, CJ
Re: svn commit: r1451633 - in /httpd/httpd/trunk: include/ap_mmn.h modules/proxy/mod_proxy.h modules/proxy/proxy_util.c
Is there any way you could add the #ifdef stuff? Since I lack a Windows and/or NetWare system, it would be better, I think, if someone who did actually fixed this instead of us simply removing it, and the person who fixed it was able to test the fix :) Thx! On Mar 1, 2013, at 9:10 PM, Guenter Knauf fua...@apache.org wrote: Hi Jim, Am 01.03.2013 17:21, schrieb j...@apache.org: Author: jim Date: Fri Mar 1 16:21:49 2013 New Revision: 1451633 URL: http://svn.apache.org/r1451633 Log: Add in rough uds support (Bugx 54101) from Blaise Tarrblaise.t...@gmail.com Modified: httpd/httpd/trunk/include/ap_mmn.h httpd/httpd/trunk/modules/proxy/mod_proxy.h httpd/httpd/trunk/modules/proxy/proxy_util.c please revert this - it breaks winsock platforms which lack support for unix sockets and sockaddr_un (Windows as well as NetWare when build with winsock). If we need this then we must either move that stuff into a separate unix-only file or ifdef everything related to unix sockets with #if APR_HAVE_SYS_UN_H ... Gün.
Re: svn commit: r1451633 - in /httpd/httpd/trunk: include/ap_mmn.h modules/proxy/mod_proxy.h modules/proxy/proxy_util.c
Hopefully r1451905 addressed this, but not having a test platform, I'm only guessing... On Mar 2, 2013, at 9:12 AM, Jim Jagielski j...@jagunet.com wrote: Is there any way you could add the #ifdef stuff? Since I lack a Windows and/or NetWare system, it would be better, I think, if someone who did actually fixed this instead of us simply removing it, and the person who fixed it was able to test the fix :) Thx! On Mar 1, 2013, at 9:10 PM, Guenter Knauf fua...@apache.org wrote: Hi Jim, Am 01.03.2013 17:21, schrieb j...@apache.org: Author: jim Date: Fri Mar 1 16:21:49 2013 New Revision: 1451633 URL: http://svn.apache.org/r1451633 Log: Add in rough uds support (Bugx 54101) from Blaise Tarrblaise.t...@gmail.com Modified: httpd/httpd/trunk/include/ap_mmn.h httpd/httpd/trunk/modules/proxy/mod_proxy.h httpd/httpd/trunk/modules/proxy/proxy_util.c please revert this - it breaks winsock platforms which lack support for unix sockets and sockaddr_un (Windows as well as NetWare when build with winsock). If we need this then we must either move that stuff into a separate unix-only file or ifdef everything related to unix sockets with #if APR_HAVE_SYS_UN_H ... Gün.
Re: svn commit: r1451633 - in /httpd/httpd/trunk: include/ap_mmn.h modules/proxy/mod_proxy.h modules/proxy/proxy_util.c
Am 02.03.2013 15:12, schrieb Jim Jagielski: Is there any way you could add the #ifdef stuff? Since I lack a Windows and/or NetWare system, it would be better, I think, if someone who did actually fixed this instead of us simply removing it, and the person who fixed it was able to test the fix :) sure ... 1st it breaks here: CC proxy_util.c ### mwccnlm Compiler: #File: proxy_util.c # - #2405: const socklen_t addrlen = APR_OFFSETOF(struct sockaddr_un, sun_path) # Error: ^^^ # ';' expected # Too many errors printed, aborting program this is because it should be apr_socklen_t; but when I fix this then next is with the struct sockaddr_un ... I've just ifdef'd this problemaric function which makes proxy_util.c compile again for NetWare; lets see what Gregg says for Windows ... http://svn.apache.org/r1451921 Gün.
Re: svn commit: r1451633 - in /httpd/httpd/trunk: include/ap_mmn.h modules/proxy/mod_proxy.h modules/proxy/proxy_util.c
On 3/2/2013 11:21 AM, Guenter Knauf wrote: Am 02.03.2013 15:12, schrieb Jim Jagielski: Is there any way you could add the #ifdef stuff? Since I lack a Windows and/or NetWare system, it would be better, I think, if someone who did actually fixed this instead of us simply removing it, and the person who fixed it was able to test the fix :) sure ... 1st it breaks here: CC proxy_util.c ### mwccnlm Compiler: #File: proxy_util.c # - #2405: const socklen_t addrlen = APR_OFFSETOF(struct sockaddr_un, sun_path) # Error: ^^^ # ';' expected # Too many errors printed, aborting program this is because it should be apr_socklen_t; but when I fix this then next is with the struct sockaddr_un ... I've just ifdef'd this problemaric function which makes proxy_util.c compile again for NetWare; lets see what Gregg says for Windows ... http://svn.apache.org/r1451921 Compiles fine on Windows
Re: svn commit: r1451633 - in /httpd/httpd/trunk: include/ap_mmn.h modules/proxy/mod_proxy.h modules/proxy/proxy_util.c
Hi Jim, Am 01.03.2013 17:21, schrieb j...@apache.org: Author: jim Date: Fri Mar 1 16:21:49 2013 New Revision: 1451633 URL: http://svn.apache.org/r1451633 Log: Add in rough uds support (Bugx 54101) from Blaise Tarrblaise.t...@gmail.com Modified: httpd/httpd/trunk/include/ap_mmn.h httpd/httpd/trunk/modules/proxy/mod_proxy.h httpd/httpd/trunk/modules/proxy/proxy_util.c please revert this - it breaks winsock platforms which lack support for unix sockets and sockaddr_un (Windows as well as NetWare when build with winsock). If we need this then we must either move that stuff into a separate unix-only file or ifdef everything related to unix sockets with #if APR_HAVE_SYS_UN_H ... Gün.
