You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by Christophe JAILLET <ch...@wanadoo.fr> on 2016/08/07 05:16:06 UTC
Re: svn commit: r1715880 - in /httpd/httpd/trunk: modules/aaa/
modules/cache/ modules/dav/main/ modules/filters/ modules/generators/
modules/http/ modules/http2/ modules/loggers/ modules/mappers/ modules/proxy/
modules/ssl/ server/
Hi,
I was about to start to submit backport proposals related to
'ap_cstr_casecmp'. The goal is to synch 2.4 and trunk a bit more.
This should not be a that easy task because:
- initial updates are big patches
- they mix code already backported and code that are only in trunk
(svn merge will give some errors)
- strcasecmp --> ap_casecmpstr --> ap_cstr_casecmp
Anyway, while looking at it, I noticed the code below.
I think that it is a leftover because I don't see any reason to handle
these 2 string comparisons differently.
CJ
Le 23/11/2015 � 17:48, ylavic@apache.org a �crit :
> Author: ylavic
> Date: Mon Nov 23 16:48:35 2015
> New Revision: 1715880
>
> URL: http://svn.apache.org/viewvc?rev=1715880&view=rev
> Log:
> More ap_casecmpstr[n]() usages.
>
> Modified:
> [...]
> httpd/httpd/trunk/modules/aaa/mod_auth_digest.c
> [...]
> Modified: httpd/httpd/trunk/modules/aaa/mod_auth_digest.c
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_auth_digest.c?rev=1715880&r1=1715879&r2=1715880&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/modules/aaa/mod_auth_digest.c (original)
> +++ httpd/httpd/trunk/modules/aaa/mod_auth_digest.c Mon Nov 23 16:48:35 2015
> @@ -542,7 +542,7 @@ static const char *set_qop(cmd_parms *cm
> if (!strcasecmp(op, "auth-int")) {
strcasecmp unchanged here.
> return "AuthDigestQop auth-int is not implemented";
> }
> - else if (strcasecmp(op, "auth")) {
> + else if (ap_casecmpstr(op, "auth")) {
but updated there.
> return apr_pstrcat(cmd->pool, "Unrecognized qop: ", op, NULL);
> }
> [...]
---
L'absence de virus dans ce courrier �lectronique a �t� v�rifi�e par le logiciel antivirus Avast.
https://www.avast.com/antivirus
Re: svn commit: r1715880 - in /httpd/httpd/trunk: modules/aaa/
modules/cache/ modules/dav/main/ modules/filters/ modules/generators/
modules/http/ modules/http2/ modules/loggers/ modules/mappers/ modules/proxy/
modules/ssl/ server/
Posted by Yann Ylavic <yl...@gmail.com>.
On Sun, Aug 7, 2016 at 7:16 AM, Christophe JAILLET
<ch...@wanadoo.fr> wrote:
> Hi,
>
> I was about to start to submit backport proposals related to
> 'ap_cstr_casecmp'. The goal is to synch 2.4 and trunk a bit more.
> This should not be a that easy task because:
> - initial updates are big patches
> - they mix code already backported and code that are only in trunk (svn
> merge will give some errors)
> - strcasecmp --> ap_casecmpstr --> ap_cstr_casecmp
Thanks Christophe for taking care of this.
I proposed a patch on dev@
(https://marc.info/?l=apache-httpd-dev&m=144838942326923&w=2) and kept
it up to date until January (attached), but never went to a formal
proposal in STATUS (lack of minimal testing) :/
Though outdated (it was ap_casecmpstr() then), it at least contains
the list of first/oldest merged commits (mergeinfo trailer).
If it could be useful to you...
>
> Anyway, while looking at it, I noticed the code below.
> I think that it is a leftover because I don't see any reason to handle these
> 2 string comparisons differently.
+1 for "fixing" the leftover.
Regards,
Yann.
Re: svn commit: r1715880 - in /httpd/httpd/trunk: modules/aaa/
modules/cache/ modules/dav/main/ modules/filters/ modules/generators/
modules/http/ modules/http2/ modules/loggers/ modules/mappers/ modules/proxy/
modules/ssl/ server/
Posted by William A Rowe Jr <wr...@rowe-clan.net>.
On Sun, Aug 7, 2016 at 12:16 AM, Christophe JAILLET <
christophe.jaillet@wanadoo.fr> wrote:
>
> Anyway, while looking at it, I noticed the code below.
> I think that it is a leftover because I don't see any reason to handle
> these 2 string comparisons differently.
>
>>
Agreed, this looks like a simple oversight, feel free to simply fix trunk...
> @@ -542,7 +542,7 @@ static const char *set_qop(cmd_parms *cm
>> if (!strcasecmp(op, "auth-int")) {
>>
> strcasecmp unchanged here.
>
> return "AuthDigestQop auth-int is not implemented";
>> }
>> - else if (strcasecmp(op, "auth")) {
>> + else if (ap_casecmpstr(op, "auth")) {
>>
> but updated there.