Re: patch for flood to deal with gcc 4
Den Friday 18 April 2008 00.24.14 skrev Guy Ferraiolo: Folks Here's the patch to get this to compile correctly with gcc 4. It's actually only 3 lines. This has been tested with the following versions: gcc version 3.4.6 20060404 (Red Hat 3.4.6-8), (RHEL4 32-bit) gcc version 4.1.1 20070105 (Red Hat 4.1.1-52) (RHEL4 64-bit) Works, thanks. There is still some warnings though: http://pastebin.se/194251 -- Regards // Oden Eriksson
Re: trunk build broken...
Ruediger Pluem wrote: Trunk should now build again. If not then you may have to clean you apr-util installation directory (remove include/apr-1/apr_ssl.h). Cheers Jean-Frederic Regards Rüdiger On 04/17/2008 07:25 PM, Jim Jagielski wrote: Hmmm httpd-trunk, apr-trunk and apr-util-trunk up to date, and yet: mod_session_crypto.c:20:66: error: apr_ssl.h: No such file or directory mod_session_crypto.c:60: error: syntax error before 'apr_evp_factory_t' mod_session_crypto.c:61: warning: function declaration isn't a prototype mod_session_crypto.c: In function 'crypt_init': mod_session_crypto.c:64: error: 'conf' undeclared (first use in this function) mod_session_crypto.c:64: error: (Each undeclared identifier is reported only once mod_session_crypto.c:64: error: for each function it appears in.) mod_session_crypto.c:65: error: 'r' undeclared (first use in this function) mod_session_crypto.c:73: error: 'key' undeclared (first use in this function) mod_session_crypto.c:73: error: 'APR_EVP_KEY_PUBLIC' undeclared (first use in this function) did a full distclean beforehand...
Re: svn commit: r649239 - in /httpd/httpd/trunk/modules/proxy: mod_proxy_ajp.c mod_proxy_http.c
On Apr 17, 2008, at 4:10 PM, Ruediger Pluem wrote:
Index: modules/proxy/mod_proxy_ajp.c
===
--- modules/proxy/mod_proxy_ajp.c (Revision 649232)
+++ modules/proxy/mod_proxy_ajp.c (Arbeitskopie)
@@ -58,18 +58,8 @@
/*
* now parse path/search args, according to rfc1738
- *
- * N.B. if this isn't a true proxy request, then the URL _path_
- * has already been decoded. True proxy requests have
- * r-uri == r-unparsed_uri, and no others have that property.
*/
-if (r-uri == r-unparsed_uri) {
-search = strchr(url, '?');
-if (search != NULL)
-*(search++) = '\0';
-}
-else
-search = r-args;
+search = NULL;
/* process path */
if (apr_table_get(r-notes, proxy-nocanon)) {
@@ -78,6 +68,7 @@
else {
path = ap_proxy_canonenc(r-pool, url, strlen(url),
enc_path, 0,
r-proxyreq);
+search = r-args;
}
if (path == NULL)
return HTTP_BAD_REQUEST;
Ummm don't we still need to address the case where url
might include the query args?
Re: svn commit: r649239 - in /httpd/httpd/trunk/modules/proxy: mod_proxy_ajp.c mod_proxy_http.c
-Ursprüngliche Nachricht-
Von: Jim Jagielski [mailto:[EMAIL PROTECTED]
Gesendet: Freitag, 18. April 2008 14:51
An: dev@httpd.apache.org
Betreff: Re: svn commit: r649239 - in
/httpd/httpd/trunk/modules/proxy: mod_proxy_ajp.c mod_proxy_http.c
On Apr 17, 2008, at 4:10 PM, Ruediger Pluem wrote:
Index: modules/proxy/mod_proxy_ajp.c
===
--- modules/proxy/mod_proxy_ajp.c (Revision 649232)
+++ modules/proxy/mod_proxy_ajp.c (Arbeitskopie)
@@ -58,18 +58,8 @@
/*
* now parse path/search args, according to rfc1738
- *
- * N.B. if this isn't a true proxy request, then the URL _path_
- * has already been decoded. True proxy requests have
- * r-uri == r-unparsed_uri, and no others have that property.
*/
-if (r-uri == r-unparsed_uri) {
-search = strchr(url, '?');
-if (search != NULL)
-*(search++) = '\0';
-}
-else
-search = r-args;
+search = NULL;
/* process path */
if (apr_table_get(r-notes, proxy-nocanon)) {
@@ -78,6 +68,7 @@
else {
path = ap_proxy_canonenc(r-pool, url, strlen(url),
enc_path, 0,
r-proxyreq);
+search = r-args;
}
if (path == NULL)
return HTTP_BAD_REQUEST;
Ummm don't we still need to address the case where url
might include the query args?
IMHO it cannot include the query args except for the nocanon
case as in all other cases r-uri was used which does not contain
query args.
This is different from the situation in mod_proxy_http where we
can act as real (forward) proxy. mod_proxy_ajp always acts as a gateway.
Regards
Rüdiger
Re: svn commit: r649239 - in /httpd/httpd/trunk/modules/proxy: mod_proxy_ajp.c mod_proxy_http.c
On Apr 18, 2008, at 8:55 AM, Plüm, Rüdiger, VF-Group wrote: IMHO it cannot include the query args except for the nocanon case as in all other cases r-uri was used which does not contain query args. This is different from the situation in mod_proxy_http where we can act as real (forward) proxy. mod_proxy_ajp always acts as a gateway. Oh... I wasn't aware you were referring *only* to the AJP impl (I saw that the patch was against that, but assumed you meant its m_p_h analog as well)... I'm all for good looking code ;)
Re: AuthzMergeRules directive
Brad Nicholes wrote: I could go along with switching the default merging rule from OR to AND, even within a dir block. The reason why it is OR today was basically for backward compatibility. Since there really wasn't any kind of logic before, OR was just the default. If we switch to AND as being the default within a dir block, it may break some existing configurations. However I also think that AND is a safer merging rule going forward. If we just switch the AuthzMergeRules default state to Off, and make On mean AND, that would be a great start. Then maybe we can revisit and take a look at what breaks if the within-block merging is AND too; if it breaks too much stuff, maybe it needs to stay OR. Right now I can't say I have an informed opinion on that. Thanks again for working through this stuff, Chris.
Re: patch for flood to deal with gcc 4
I believe the other warnings are from the code prior to my patch. I was somewhat shy about altering other people's code as a newbie. The fixes would be easy, anyone could do them. I felt responsible for my new code which others might not want to mess with. Guy On Fri, 2008-04-18 at 09:24 +0200, Oden Eriksson wrote: Den Friday 18 April 2008 00.24.14 skrev Guy Ferraiolo: Folks Here's the patch to get this to compile correctly with gcc 4. It's actually only 3 lines. This has been tested with the following versions: gcc version 3.4.6 20060404 (Red Hat 3.4.6-8), (RHEL4 32-bit) gcc version 4.1.1 20070105 (Red Hat 4.1.1-52) (RHEL4 64-bit) Works, thanks. There is still some warnings though: http://pastebin.se/194251 -- Guy Ferraiolo mailto:[EMAIL PROTECTED] Performance Measurement Analysis http://CNET.com CNETtel: 1.908.541.3739 1200 Route 22 East fax: 1.908.575.7474 Bridgewater, NJ 08807 cel: 1.732.618.0250
Re: patch for flood to deal with gcc 4
Den Friday 18 April 2008 17.49.29 skrev Guy Ferraiolo: I believe the other warnings are from the code prior to my patch. I was somewhat shy about altering other people's code as a newbie. The fixes would be easy, anyone could do them. I felt responsible for my new code which others might not want to mess with. Guy On Fri, 2008-04-18 at 09:24 +0200, Oden Eriksson wrote: Den Friday 18 April 2008 00.24.14 skrev Guy Ferraiolo: Folks Here's the patch to get this to compile correctly with gcc 4. It's actually only 3 lines. This has been tested with the following versions: gcc version 3.4.6 20060404 (Red Hat 3.4.6-8), (RHEL4 32-bit) gcc version 4.1.1 20070105 (Red Hat 4.1.1-52) (RHEL4 64-bit) Works, thanks. There is still some warnings though: http://pastebin.se/194251 I understood that, thanks man. I merely wanted to make the person maintaining the code aware. -- Regards // Oden Eriksson
