You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@couchdb.apache.org by Jan Lehnardt <ja...@apache.org> on 2012/10/10 22:06:55 UTC
Re: git commit: Disable checking for string query_params values
Jason,
did you mean to commit this to Apache?
Cheers
Jan
--
On Sep 14, 2012, at 04:08 , jhs@apache.org wrote:
> Updated Branches:
> refs/heads/COUCHDB-1534 [created] 835b57b19
>
>
> Disable checking for string query_params values
>
>
> Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
> Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/835b57b1
> Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/835b57b1
> Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/835b57b1
>
> Branch: refs/heads/COUCHDB-1534
> Commit: 835b57b196d423ae5132a559e727031521da8ce9
> Parents: 53490d9
> Author: Jason Smith (work) <jh...@iriscouch.com>
> Authored: Tue Sep 4 06:35:52 2012 +0000
> Committer: Jason Smith (air) <jh...@iriscouch.com>
> Committed: Fri Sep 14 09:02:04 2012 +0700
>
> ----------------------------------------------------------------------
> src/couchdb/couch_httpd_replicator.erl | 6 ++++--
> 1 files changed, 4 insertions(+), 2 deletions(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/couchdb/blob/835b57b1/src/couchdb/couch_httpd_replicator.erl
> ----------------------------------------------------------------------
> diff --git a/src/couchdb/couch_httpd_replicator.erl b/src/couchdb/couch_httpd_replicator.erl
> index fb1e350..47de476 100644
> --- a/src/couchdb/couch_httpd_replicator.erl
> +++ b/src/couchdb/couch_httpd_replicator.erl
> @@ -58,8 +58,10 @@ validate_rep_props([]) ->
> validate_rep_props([{<<"query_params">>, {Params}}|Rest]) ->
> lists:foreach(fun
> ({_,V}) when is_binary(V) -> ok;
> - ({K,_}) -> throw({bad_request,
> - <<K/binary," value must be a string.">>})
> + % Disabled to support the iris-monitor replicator
> + %({K,_}) -> throw({bad_request,
> + % <<K/binary," value must be a string.">>})
> + ({K,_}) -> ok
> end, Params),
> validate_rep_props(Rest);
> validate_rep_props([_|Rest]) ->
>
Re: git commit: Disable checking for string query_params values
Posted by Benoit Chesneau <bc...@gmail.com>.
Thinking more about that issue, and I think that once the patch for
the view changes will be integrated there is a need to accept any JSON
value there for the view params. Then maybe just removing the comments
since we won't have it anymore.
On Fri, Apr 5, 2013 at 8:12 PM, Benoit Chesneau <bc...@gmail.com> wrote:
> If the intention is to remove that filter, then why just comment it?
> Imo the patch should be reworked.
>
> Also not sure it should be re removed, the question is more why should
> we accept any JSON value there? What is the purpose? Shouldn't we on
> the contrary fix the replicator db to not accept that?
>
> This case looks similar to the possibility we add to pass any JSON
> values in roles. We decided in that case to forbid this usage if I
> remember well, didn't check in the commits. Isn't it similar?
>
> I'm trying to understand the issue there. Also the discussion should
> probably happen on COUCHDB-1534 which is still open.
>
> - benoît
>
> On Fri, Apr 5, 2013 at 7:53 PM, Noah Slater <ap...@tumbolia.org> wrote:
>> Okay. Thanks!
>>
>> On Fri, Apr 5, 2013 at 6:01 PM, Jason Smith <jh...@iriscouch.com> wrote:
>>
>>> No and no.
>>> On Wed, Apr 3, 2013 at 12:24 AM, Noah Slater <ns...@apache.org> wrote:
>>>> Has it been backed out? (Should it be?)
>>>>
>>>>
>>>> On 25 March 2013 11:12, Jason Smith <jh...@iriscouch.com> wrote:
>>>>
>>>>> I checked, this commit is only in the COUCHDB-1534 branch in Git. It is not
>>>>> in any others (1.3.x, master).
>>>>>
>>>>>
>>>>> On Mon, Mar 25, 2013 at 11:09 AM, Jason Smith <jh...@iriscouch.com> wrote:
>>>>>
>>>>> > Oh wow, sorry, all, I missed this.
>>>>> >
>>>>> > The commit addresses COUCHDB-1534. However that issue is not yet closed
>>>>> > due to missing unit tests. And Paul wants to remove the function entirely
>>>>> > (which is fine by me).
>>>>> >
>>>>> > The comment about iris-monitor was for me, when I diff our branch against
>>>>> > ASF, I would recall the reason for the change. But it is spurious. I
>>>>> > believe I cherry-picked a commit and forgot about the comment.
>>>>> >
>>>>> >
>>>>> >
>>>>> > On Sat, Mar 23, 2013 at 8:02 PM, Noah Slater <ns...@apache.org> wrote:
>>>>> >
>>>>> >> Was this a mistaken commit? Was it resolved?
>>>>> >>
>>>>> >>
>>>>> >> On 10 October 2012 21:06, Jan Lehnardt <ja...@apache.org> wrote:
>>>>> >>
>>>>> >> > Jason,
>>>>> >> >
>>>>> >> > did you mean to commit this to Apache?
>>>>> >> >
>>>>> >> > Cheers
>>>>> >> > Jan
>>>>> >> > --
>>>>> >> >
>>>>> >> >
>>>>> >> > On Sep 14, 2012, at 04:08 , jhs@apache.org wrote:
>>>>> >> >
>>>>> >> > > Updated Branches:
>>>>> >> > > refs/heads/COUCHDB-1534 [created] 835b57b19
>>>>> >> > >
>>>>> >> > >
>>>>> >> > > Disable checking for string query_params values
>>>>> >> > >
>>>>> >> > >
>>>>> >> > > Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
>>>>> >> > > Commit:
>>>>> >> http://git-wip-us.apache.org/repos/asf/couchdb/commit/835b57b1
>>>>> >> > > Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/835b57b1
>>>>> >> > > Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/835b57b1
>>>>> >> > >
>>>>> >> > > Branch: refs/heads/COUCHDB-1534
>>>>> >> > > Commit: 835b57b196d423ae5132a559e727031521da8ce9
>>>>> >> > > Parents: 53490d9
>>>>> >> > > Author: Jason Smith (work) <jh...@iriscouch.com>
>>>>> >> > > Authored: Tue Sep 4 06:35:52 2012 +0000
>>>>> >> > > Committer: Jason Smith (air) <jh...@iriscouch.com>
>>>>> >> > > Committed: Fri Sep 14 09:02:04 2012 +0700
>>>>> >> > >
>>>>> >> > >
>>>>> ----------------------------------------------------------------------
>>>>> >> > > src/couchdb/couch_httpd_replicator.erl | 6 ++++--
>>>>> >> > > 1 files changed, 4 insertions(+), 2 deletions(-)
>>>>> >> > >
>>>>> ----------------------------------------------------------------------
>>>>> >> > >
>>>>> >> > >
>>>>> >> > >
>>>>> >> >
>>>>> >>
>>>>> http://git-wip-us.apache.org/repos/asf/couchdb/blob/835b57b1/src/couchdb/couch_httpd_replicator.erl
>>>>> >> > >
>>>>> ----------------------------------------------------------------------
>>>>> >> > > diff --git a/src/couchdb/couch_httpd_replicator.erl
>>>>> >> > b/src/couchdb/couch_httpd_replicator.erl
>>>>> >> > > index fb1e350..47de476 100644
>>>>> >> > > --- a/src/couchdb/couch_httpd_replicator.erl
>>>>> >> > > +++ b/src/couchdb/couch_httpd_replicator.erl
>>>>> >> > > @@ -58,8 +58,10 @@ validate_rep_props([]) ->
>>>>> >> > > validate_rep_props([{<<"query_params">>, {Params}}|Rest]) ->
>>>>> >> > > lists:foreach(fun
>>>>> >> > > ({_,V}) when is_binary(V) -> ok;
>>>>> >> > > - ({K,_}) -> throw({bad_request,
>>>>> >> > > - <<K/binary," value must be a string.">>})
>>>>> >> > > + % Disabled to support the iris-monitor replicator
>>>>> >> > > + %({K,_}) -> throw({bad_request,
>>>>> >> > > + % <<K/binary," value must be a string.">>})
>>>>> >> > > + ({K,_}) -> ok
>>>>> >> > > end, Params),
>>>>> >> > > validate_rep_props(Rest);
>>>>> >> > > validate_rep_props([_|Rest]) ->
>>>>> >> > >
>>>>> >> >
>>>>> >> >
>>>>> >>
>>>>> >>
>>>>> >> --
>>>>> >> NS
>>>>> >>
>>>>> >
>>>>> >
>>>>> >
>>>>> > --
>>>>> > Iris Couch
>>>>> >
>>>>>
>>>>>
>>>>>
>>>>> --
>>>>> Iris Couch
>>>>>
>>>>
>>>>
>>>>
>>>> --
>>>> NS
>>> --
>>> Iris Couch
Re: git commit: Disable checking for string query_params values
Posted by Benoit Chesneau <bc...@gmail.com>.
If the intention is to remove that filter, then why just comment it?
Imo the patch should be reworked.
Also not sure it should be re removed, the question is more why should
we accept any JSON value there? What is the purpose? Shouldn't we on
the contrary fix the replicator db to not accept that?
This case looks similar to the possibility we add to pass any JSON
values in roles. We decided in that case to forbid this usage if I
remember well, didn't check in the commits. Isn't it similar?
I'm trying to understand the issue there. Also the discussion should
probably happen on COUCHDB-1534 which is still open.
- benoît
On Fri, Apr 5, 2013 at 7:53 PM, Noah Slater <ap...@tumbolia.org> wrote:
> Okay. Thanks!
>
> On Fri, Apr 5, 2013 at 6:01 PM, Jason Smith <jh...@iriscouch.com> wrote:
>
>> No and no.
>> On Wed, Apr 3, 2013 at 12:24 AM, Noah Slater <ns...@apache.org> wrote:
>>> Has it been backed out? (Should it be?)
>>>
>>>
>>> On 25 March 2013 11:12, Jason Smith <jh...@iriscouch.com> wrote:
>>>
>>>> I checked, this commit is only in the COUCHDB-1534 branch in Git. It is not
>>>> in any others (1.3.x, master).
>>>>
>>>>
>>>> On Mon, Mar 25, 2013 at 11:09 AM, Jason Smith <jh...@iriscouch.com> wrote:
>>>>
>>>> > Oh wow, sorry, all, I missed this.
>>>> >
>>>> > The commit addresses COUCHDB-1534. However that issue is not yet closed
>>>> > due to missing unit tests. And Paul wants to remove the function entirely
>>>> > (which is fine by me).
>>>> >
>>>> > The comment about iris-monitor was for me, when I diff our branch against
>>>> > ASF, I would recall the reason for the change. But it is spurious. I
>>>> > believe I cherry-picked a commit and forgot about the comment.
>>>> >
>>>> >
>>>> >
>>>> > On Sat, Mar 23, 2013 at 8:02 PM, Noah Slater <ns...@apache.org> wrote:
>>>> >
>>>> >> Was this a mistaken commit? Was it resolved?
>>>> >>
>>>> >>
>>>> >> On 10 October 2012 21:06, Jan Lehnardt <ja...@apache.org> wrote:
>>>> >>
>>>> >> > Jason,
>>>> >> >
>>>> >> > did you mean to commit this to Apache?
>>>> >> >
>>>> >> > Cheers
>>>> >> > Jan
>>>> >> > --
>>>> >> >
>>>> >> >
>>>> >> > On Sep 14, 2012, at 04:08 , jhs@apache.org wrote:
>>>> >> >
>>>> >> > > Updated Branches:
>>>> >> > > refs/heads/COUCHDB-1534 [created] 835b57b19
>>>> >> > >
>>>> >> > >
>>>> >> > > Disable checking for string query_params values
>>>> >> > >
>>>> >> > >
>>>> >> > > Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
>>>> >> > > Commit:
>>>> >> http://git-wip-us.apache.org/repos/asf/couchdb/commit/835b57b1
>>>> >> > > Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/835b57b1
>>>> >> > > Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/835b57b1
>>>> >> > >
>>>> >> > > Branch: refs/heads/COUCHDB-1534
>>>> >> > > Commit: 835b57b196d423ae5132a559e727031521da8ce9
>>>> >> > > Parents: 53490d9
>>>> >> > > Author: Jason Smith (work) <jh...@iriscouch.com>
>>>> >> > > Authored: Tue Sep 4 06:35:52 2012 +0000
>>>> >> > > Committer: Jason Smith (air) <jh...@iriscouch.com>
>>>> >> > > Committed: Fri Sep 14 09:02:04 2012 +0700
>>>> >> > >
>>>> >> > >
>>>> ----------------------------------------------------------------------
>>>> >> > > src/couchdb/couch_httpd_replicator.erl | 6 ++++--
>>>> >> > > 1 files changed, 4 insertions(+), 2 deletions(-)
>>>> >> > >
>>>> ----------------------------------------------------------------------
>>>> >> > >
>>>> >> > >
>>>> >> > >
>>>> >> >
>>>> >>
>>>> http://git-wip-us.apache.org/repos/asf/couchdb/blob/835b57b1/src/couchdb/couch_httpd_replicator.erl
>>>> >> > >
>>>> ----------------------------------------------------------------------
>>>> >> > > diff --git a/src/couchdb/couch_httpd_replicator.erl
>>>> >> > b/src/couchdb/couch_httpd_replicator.erl
>>>> >> > > index fb1e350..47de476 100644
>>>> >> > > --- a/src/couchdb/couch_httpd_replicator.erl
>>>> >> > > +++ b/src/couchdb/couch_httpd_replicator.erl
>>>> >> > > @@ -58,8 +58,10 @@ validate_rep_props([]) ->
>>>> >> > > validate_rep_props([{<<"query_params">>, {Params}}|Rest]) ->
>>>> >> > > lists:foreach(fun
>>>> >> > > ({_,V}) when is_binary(V) -> ok;
>>>> >> > > - ({K,_}) -> throw({bad_request,
>>>> >> > > - <<K/binary," value must be a string.">>})
>>>> >> > > + % Disabled to support the iris-monitor replicator
>>>> >> > > + %({K,_}) -> throw({bad_request,
>>>> >> > > + % <<K/binary," value must be a string.">>})
>>>> >> > > + ({K,_}) -> ok
>>>> >> > > end, Params),
>>>> >> > > validate_rep_props(Rest);
>>>> >> > > validate_rep_props([_|Rest]) ->
>>>> >> > >
>>>> >> >
>>>> >> >
>>>> >>
>>>> >>
>>>> >> --
>>>> >> NS
>>>> >>
>>>> >
>>>> >
>>>> >
>>>> > --
>>>> > Iris Couch
>>>> >
>>>>
>>>>
>>>>
>>>> --
>>>> Iris Couch
>>>>
>>>
>>>
>>>
>>> --
>>> NS
>> --
>> Iris Couch
Re: git commit: Disable checking for string query_params values
Posted by Noah Slater <ap...@tumbolia.org>.
Okay. Thanks!
On Fri, Apr 5, 2013 at 6:01 PM, Jason Smith <jh...@iriscouch.com> wrote:
> No and no.
> On Wed, Apr 3, 2013 at 12:24 AM, Noah Slater <ns...@apache.org> wrote:
>> Has it been backed out? (Should it be?)
>>
>>
>> On 25 March 2013 11:12, Jason Smith <jh...@iriscouch.com> wrote:
>>
>>> I checked, this commit is only in the COUCHDB-1534 branch in Git. It is not
>>> in any others (1.3.x, master).
>>>
>>>
>>> On Mon, Mar 25, 2013 at 11:09 AM, Jason Smith <jh...@iriscouch.com> wrote:
>>>
>>> > Oh wow, sorry, all, I missed this.
>>> >
>>> > The commit addresses COUCHDB-1534. However that issue is not yet closed
>>> > due to missing unit tests. And Paul wants to remove the function entirely
>>> > (which is fine by me).
>>> >
>>> > The comment about iris-monitor was for me, when I diff our branch against
>>> > ASF, I would recall the reason for the change. But it is spurious. I
>>> > believe I cherry-picked a commit and forgot about the comment.
>>> >
>>> >
>>> >
>>> > On Sat, Mar 23, 2013 at 8:02 PM, Noah Slater <ns...@apache.org> wrote:
>>> >
>>> >> Was this a mistaken commit? Was it resolved?
>>> >>
>>> >>
>>> >> On 10 October 2012 21:06, Jan Lehnardt <ja...@apache.org> wrote:
>>> >>
>>> >> > Jason,
>>> >> >
>>> >> > did you mean to commit this to Apache?
>>> >> >
>>> >> > Cheers
>>> >> > Jan
>>> >> > --
>>> >> >
>>> >> >
>>> >> > On Sep 14, 2012, at 04:08 , jhs@apache.org wrote:
>>> >> >
>>> >> > > Updated Branches:
>>> >> > > refs/heads/COUCHDB-1534 [created] 835b57b19
>>> >> > >
>>> >> > >
>>> >> > > Disable checking for string query_params values
>>> >> > >
>>> >> > >
>>> >> > > Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
>>> >> > > Commit:
>>> >> http://git-wip-us.apache.org/repos/asf/couchdb/commit/835b57b1
>>> >> > > Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/835b57b1
>>> >> > > Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/835b57b1
>>> >> > >
>>> >> > > Branch: refs/heads/COUCHDB-1534
>>> >> > > Commit: 835b57b196d423ae5132a559e727031521da8ce9
>>> >> > > Parents: 53490d9
>>> >> > > Author: Jason Smith (work) <jh...@iriscouch.com>
>>> >> > > Authored: Tue Sep 4 06:35:52 2012 +0000
>>> >> > > Committer: Jason Smith (air) <jh...@iriscouch.com>
>>> >> > > Committed: Fri Sep 14 09:02:04 2012 +0700
>>> >> > >
>>> >> > >
>>> ----------------------------------------------------------------------
>>> >> > > src/couchdb/couch_httpd_replicator.erl | 6 ++++--
>>> >> > > 1 files changed, 4 insertions(+), 2 deletions(-)
>>> >> > >
>>> ----------------------------------------------------------------------
>>> >> > >
>>> >> > >
>>> >> > >
>>> >> >
>>> >>
>>> http://git-wip-us.apache.org/repos/asf/couchdb/blob/835b57b1/src/couchdb/couch_httpd_replicator.erl
>>> >> > >
>>> ----------------------------------------------------------------------
>>> >> > > diff --git a/src/couchdb/couch_httpd_replicator.erl
>>> >> > b/src/couchdb/couch_httpd_replicator.erl
>>> >> > > index fb1e350..47de476 100644
>>> >> > > --- a/src/couchdb/couch_httpd_replicator.erl
>>> >> > > +++ b/src/couchdb/couch_httpd_replicator.erl
>>> >> > > @@ -58,8 +58,10 @@ validate_rep_props([]) ->
>>> >> > > validate_rep_props([{<<"query_params">>, {Params}}|Rest]) ->
>>> >> > > lists:foreach(fun
>>> >> > > ({_,V}) when is_binary(V) -> ok;
>>> >> > > - ({K,_}) -> throw({bad_request,
>>> >> > > - <<K/binary," value must be a string.">>})
>>> >> > > + % Disabled to support the iris-monitor replicator
>>> >> > > + %({K,_}) -> throw({bad_request,
>>> >> > > + % <<K/binary," value must be a string.">>})
>>> >> > > + ({K,_}) -> ok
>>> >> > > end, Params),
>>> >> > > validate_rep_props(Rest);
>>> >> > > validate_rep_props([_|Rest]) ->
>>> >> > >
>>> >> >
>>> >> >
>>> >>
>>> >>
>>> >> --
>>> >> NS
>>> >>
>>> >
>>> >
>>> >
>>> > --
>>> > Iris Couch
>>> >
>>>
>>>
>>>
>>> --
>>> Iris Couch
>>>
>>
>>
>>
>> --
>> NS
> --
> Iris Couch
Re: git commit: Disable checking for string query_params values
Posted by Jason Smith <jh...@iriscouch.com>.
No and no.
On Wed, Apr 3, 2013 at 12:24 AM, Noah Slater <ns...@apache.org> wrote:
> Has it been backed out? (Should it be?)
>
>
> On 25 March 2013 11:12, Jason Smith <jh...@iriscouch.com> wrote:
>
>> I checked, this commit is only in the COUCHDB-1534 branch in Git. It is not
>> in any others (1.3.x, master).
>>
>>
>> On Mon, Mar 25, 2013 at 11:09 AM, Jason Smith <jh...@iriscouch.com> wrote:
>>
>> > Oh wow, sorry, all, I missed this.
>> >
>> > The commit addresses COUCHDB-1534. However that issue is not yet closed
>> > due to missing unit tests. And Paul wants to remove the function entirely
>> > (which is fine by me).
>> >
>> > The comment about iris-monitor was for me, when I diff our branch against
>> > ASF, I would recall the reason for the change. But it is spurious. I
>> > believe I cherry-picked a commit and forgot about the comment.
>> >
>> >
>> >
>> > On Sat, Mar 23, 2013 at 8:02 PM, Noah Slater <ns...@apache.org> wrote:
>> >
>> >> Was this a mistaken commit? Was it resolved?
>> >>
>> >>
>> >> On 10 October 2012 21:06, Jan Lehnardt <ja...@apache.org> wrote:
>> >>
>> >> > Jason,
>> >> >
>> >> > did you mean to commit this to Apache?
>> >> >
>> >> > Cheers
>> >> > Jan
>> >> > --
>> >> >
>> >> >
>> >> > On Sep 14, 2012, at 04:08 , jhs@apache.org wrote:
>> >> >
>> >> > > Updated Branches:
>> >> > > refs/heads/COUCHDB-1534 [created] 835b57b19
>> >> > >
>> >> > >
>> >> > > Disable checking for string query_params values
>> >> > >
>> >> > >
>> >> > > Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
>> >> > > Commit:
>> >> http://git-wip-us.apache.org/repos/asf/couchdb/commit/835b57b1
>> >> > > Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/835b57b1
>> >> > > Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/835b57b1
>> >> > >
>> >> > > Branch: refs/heads/COUCHDB-1534
>> >> > > Commit: 835b57b196d423ae5132a559e727031521da8ce9
>> >> > > Parents: 53490d9
>> >> > > Author: Jason Smith (work) <jh...@iriscouch.com>
>> >> > > Authored: Tue Sep 4 06:35:52 2012 +0000
>> >> > > Committer: Jason Smith (air) <jh...@iriscouch.com>
>> >> > > Committed: Fri Sep 14 09:02:04 2012 +0700
>> >> > >
>> >> > >
>> ----------------------------------------------------------------------
>> >> > > src/couchdb/couch_httpd_replicator.erl | 6 ++++--
>> >> > > 1 files changed, 4 insertions(+), 2 deletions(-)
>> >> > >
>> ----------------------------------------------------------------------
>> >> > >
>> >> > >
>> >> > >
>> >> >
>> >>
>> http://git-wip-us.apache.org/repos/asf/couchdb/blob/835b57b1/src/couchdb/couch_httpd_replicator.erl
>> >> > >
>> ----------------------------------------------------------------------
>> >> > > diff --git a/src/couchdb/couch_httpd_replicator.erl
>> >> > b/src/couchdb/couch_httpd_replicator.erl
>> >> > > index fb1e350..47de476 100644
>> >> > > --- a/src/couchdb/couch_httpd_replicator.erl
>> >> > > +++ b/src/couchdb/couch_httpd_replicator.erl
>> >> > > @@ -58,8 +58,10 @@ validate_rep_props([]) ->
>> >> > > validate_rep_props([{<<"query_params">>, {Params}}|Rest]) ->
>> >> > > lists:foreach(fun
>> >> > > ({_,V}) when is_binary(V) -> ok;
>> >> > > - ({K,_}) -> throw({bad_request,
>> >> > > - <<K/binary," value must be a string.">>})
>> >> > > + % Disabled to support the iris-monitor replicator
>> >> > > + %({K,_}) -> throw({bad_request,
>> >> > > + % <<K/binary," value must be a string.">>})
>> >> > > + ({K,_}) -> ok
>> >> > > end, Params),
>> >> > > validate_rep_props(Rest);
>> >> > > validate_rep_props([_|Rest]) ->
>> >> > >
>> >> >
>> >> >
>> >>
>> >>
>> >> --
>> >> NS
>> >>
>> >
>> >
>> >
>> > --
>> > Iris Couch
>> >
>>
>>
>>
>> --
>> Iris Couch
>>
>
>
>
> --
> NS
--
Iris Couch
Re: git commit: Disable checking for string query_params values
Posted by Noah Slater <ns...@apache.org>.
Has it been backed out? (Should it be?)
On 25 March 2013 11:12, Jason Smith <jh...@iriscouch.com> wrote:
> I checked, this commit is only in the COUCHDB-1534 branch in Git. It is not
> in any others (1.3.x, master).
>
>
> On Mon, Mar 25, 2013 at 11:09 AM, Jason Smith <jh...@iriscouch.com> wrote:
>
> > Oh wow, sorry, all, I missed this.
> >
> > The commit addresses COUCHDB-1534. However that issue is not yet closed
> > due to missing unit tests. And Paul wants to remove the function entirely
> > (which is fine by me).
> >
> > The comment about iris-monitor was for me, when I diff our branch against
> > ASF, I would recall the reason for the change. But it is spurious. I
> > believe I cherry-picked a commit and forgot about the comment.
> >
> >
> >
> > On Sat, Mar 23, 2013 at 8:02 PM, Noah Slater <ns...@apache.org> wrote:
> >
> >> Was this a mistaken commit? Was it resolved?
> >>
> >>
> >> On 10 October 2012 21:06, Jan Lehnardt <ja...@apache.org> wrote:
> >>
> >> > Jason,
> >> >
> >> > did you mean to commit this to Apache?
> >> >
> >> > Cheers
> >> > Jan
> >> > --
> >> >
> >> >
> >> > On Sep 14, 2012, at 04:08 , jhs@apache.org wrote:
> >> >
> >> > > Updated Branches:
> >> > > refs/heads/COUCHDB-1534 [created] 835b57b19
> >> > >
> >> > >
> >> > > Disable checking for string query_params values
> >> > >
> >> > >
> >> > > Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
> >> > > Commit:
> >> http://git-wip-us.apache.org/repos/asf/couchdb/commit/835b57b1
> >> > > Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/835b57b1
> >> > > Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/835b57b1
> >> > >
> >> > > Branch: refs/heads/COUCHDB-1534
> >> > > Commit: 835b57b196d423ae5132a559e727031521da8ce9
> >> > > Parents: 53490d9
> >> > > Author: Jason Smith (work) <jh...@iriscouch.com>
> >> > > Authored: Tue Sep 4 06:35:52 2012 +0000
> >> > > Committer: Jason Smith (air) <jh...@iriscouch.com>
> >> > > Committed: Fri Sep 14 09:02:04 2012 +0700
> >> > >
> >> > >
> ----------------------------------------------------------------------
> >> > > src/couchdb/couch_httpd_replicator.erl | 6 ++++--
> >> > > 1 files changed, 4 insertions(+), 2 deletions(-)
> >> > >
> ----------------------------------------------------------------------
> >> > >
> >> > >
> >> > >
> >> >
> >>
> http://git-wip-us.apache.org/repos/asf/couchdb/blob/835b57b1/src/couchdb/couch_httpd_replicator.erl
> >> > >
> ----------------------------------------------------------------------
> >> > > diff --git a/src/couchdb/couch_httpd_replicator.erl
> >> > b/src/couchdb/couch_httpd_replicator.erl
> >> > > index fb1e350..47de476 100644
> >> > > --- a/src/couchdb/couch_httpd_replicator.erl
> >> > > +++ b/src/couchdb/couch_httpd_replicator.erl
> >> > > @@ -58,8 +58,10 @@ validate_rep_props([]) ->
> >> > > validate_rep_props([{<<"query_params">>, {Params}}|Rest]) ->
> >> > > lists:foreach(fun
> >> > > ({_,V}) when is_binary(V) -> ok;
> >> > > - ({K,_}) -> throw({bad_request,
> >> > > - <<K/binary," value must be a string.">>})
> >> > > + % Disabled to support the iris-monitor replicator
> >> > > + %({K,_}) -> throw({bad_request,
> >> > > + % <<K/binary," value must be a string.">>})
> >> > > + ({K,_}) -> ok
> >> > > end, Params),
> >> > > validate_rep_props(Rest);
> >> > > validate_rep_props([_|Rest]) ->
> >> > >
> >> >
> >> >
> >>
> >>
> >> --
> >> NS
> >>
> >
> >
> >
> > --
> > Iris Couch
> >
>
>
>
> --
> Iris Couch
>
--
NS
Re: git commit: Disable checking for string query_params values
Posted by Jason Smith <jh...@iriscouch.com>.
I checked, this commit is only in the COUCHDB-1534 branch in Git. It is not
in any others (1.3.x, master).
On Mon, Mar 25, 2013 at 11:09 AM, Jason Smith <jh...@iriscouch.com> wrote:
> Oh wow, sorry, all, I missed this.
>
> The commit addresses COUCHDB-1534. However that issue is not yet closed
> due to missing unit tests. And Paul wants to remove the function entirely
> (which is fine by me).
>
> The comment about iris-monitor was for me, when I diff our branch against
> ASF, I would recall the reason for the change. But it is spurious. I
> believe I cherry-picked a commit and forgot about the comment.
>
>
>
> On Sat, Mar 23, 2013 at 8:02 PM, Noah Slater <ns...@apache.org> wrote:
>
>> Was this a mistaken commit? Was it resolved?
>>
>>
>> On 10 October 2012 21:06, Jan Lehnardt <ja...@apache.org> wrote:
>>
>> > Jason,
>> >
>> > did you mean to commit this to Apache?
>> >
>> > Cheers
>> > Jan
>> > --
>> >
>> >
>> > On Sep 14, 2012, at 04:08 , jhs@apache.org wrote:
>> >
>> > > Updated Branches:
>> > > refs/heads/COUCHDB-1534 [created] 835b57b19
>> > >
>> > >
>> > > Disable checking for string query_params values
>> > >
>> > >
>> > > Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
>> > > Commit:
>> http://git-wip-us.apache.org/repos/asf/couchdb/commit/835b57b1
>> > > Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/835b57b1
>> > > Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/835b57b1
>> > >
>> > > Branch: refs/heads/COUCHDB-1534
>> > > Commit: 835b57b196d423ae5132a559e727031521da8ce9
>> > > Parents: 53490d9
>> > > Author: Jason Smith (work) <jh...@iriscouch.com>
>> > > Authored: Tue Sep 4 06:35:52 2012 +0000
>> > > Committer: Jason Smith (air) <jh...@iriscouch.com>
>> > > Committed: Fri Sep 14 09:02:04 2012 +0700
>> > >
>> > > ----------------------------------------------------------------------
>> > > src/couchdb/couch_httpd_replicator.erl | 6 ++++--
>> > > 1 files changed, 4 insertions(+), 2 deletions(-)
>> > > ----------------------------------------------------------------------
>> > >
>> > >
>> > >
>> >
>> http://git-wip-us.apache.org/repos/asf/couchdb/blob/835b57b1/src/couchdb/couch_httpd_replicator.erl
>> > > ----------------------------------------------------------------------
>> > > diff --git a/src/couchdb/couch_httpd_replicator.erl
>> > b/src/couchdb/couch_httpd_replicator.erl
>> > > index fb1e350..47de476 100644
>> > > --- a/src/couchdb/couch_httpd_replicator.erl
>> > > +++ b/src/couchdb/couch_httpd_replicator.erl
>> > > @@ -58,8 +58,10 @@ validate_rep_props([]) ->
>> > > validate_rep_props([{<<"query_params">>, {Params}}|Rest]) ->
>> > > lists:foreach(fun
>> > > ({_,V}) when is_binary(V) -> ok;
>> > > - ({K,_}) -> throw({bad_request,
>> > > - <<K/binary," value must be a string.">>})
>> > > + % Disabled to support the iris-monitor replicator
>> > > + %({K,_}) -> throw({bad_request,
>> > > + % <<K/binary," value must be a string.">>})
>> > > + ({K,_}) -> ok
>> > > end, Params),
>> > > validate_rep_props(Rest);
>> > > validate_rep_props([_|Rest]) ->
>> > >
>> >
>> >
>>
>>
>> --
>> NS
>>
>
>
>
> --
> Iris Couch
>
--
Iris Couch
Re: git commit: Disable checking for string query_params values
Posted by Jason Smith <jh...@iriscouch.com>.
Oh wow, sorry, all, I missed this.
The commit addresses COUCHDB-1534. However that issue is not yet closed due
to missing unit tests. And Paul wants to remove the function entirely
(which is fine by me).
The comment about iris-monitor was for me, when I diff our branch against
ASF, I would recall the reason for the change. But it is spurious. I
believe I cherry-picked a commit and forgot about the comment.
On Sat, Mar 23, 2013 at 8:02 PM, Noah Slater <ns...@apache.org> wrote:
> Was this a mistaken commit? Was it resolved?
>
>
> On 10 October 2012 21:06, Jan Lehnardt <ja...@apache.org> wrote:
>
> > Jason,
> >
> > did you mean to commit this to Apache?
> >
> > Cheers
> > Jan
> > --
> >
> >
> > On Sep 14, 2012, at 04:08 , jhs@apache.org wrote:
> >
> > > Updated Branches:
> > > refs/heads/COUCHDB-1534 [created] 835b57b19
> > >
> > >
> > > Disable checking for string query_params values
> > >
> > >
> > > Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
> > > Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/835b57b1
> > > Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/835b57b1
> > > Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/835b57b1
> > >
> > > Branch: refs/heads/COUCHDB-1534
> > > Commit: 835b57b196d423ae5132a559e727031521da8ce9
> > > Parents: 53490d9
> > > Author: Jason Smith (work) <jh...@iriscouch.com>
> > > Authored: Tue Sep 4 06:35:52 2012 +0000
> > > Committer: Jason Smith (air) <jh...@iriscouch.com>
> > > Committed: Fri Sep 14 09:02:04 2012 +0700
> > >
> > > ----------------------------------------------------------------------
> > > src/couchdb/couch_httpd_replicator.erl | 6 ++++--
> > > 1 files changed, 4 insertions(+), 2 deletions(-)
> > > ----------------------------------------------------------------------
> > >
> > >
> > >
> >
> http://git-wip-us.apache.org/repos/asf/couchdb/blob/835b57b1/src/couchdb/couch_httpd_replicator.erl
> > > ----------------------------------------------------------------------
> > > diff --git a/src/couchdb/couch_httpd_replicator.erl
> > b/src/couchdb/couch_httpd_replicator.erl
> > > index fb1e350..47de476 100644
> > > --- a/src/couchdb/couch_httpd_replicator.erl
> > > +++ b/src/couchdb/couch_httpd_replicator.erl
> > > @@ -58,8 +58,10 @@ validate_rep_props([]) ->
> > > validate_rep_props([{<<"query_params">>, {Params}}|Rest]) ->
> > > lists:foreach(fun
> > > ({_,V}) when is_binary(V) -> ok;
> > > - ({K,_}) -> throw({bad_request,
> > > - <<K/binary," value must be a string.">>})
> > > + % Disabled to support the iris-monitor replicator
> > > + %({K,_}) -> throw({bad_request,
> > > + % <<K/binary," value must be a string.">>})
> > > + ({K,_}) -> ok
> > > end, Params),
> > > validate_rep_props(Rest);
> > > validate_rep_props([_|Rest]) ->
> > >
> >
> >
>
>
> --
> NS
>
--
Iris Couch
Re: git commit: Disable checking for string query_params values
Posted by Noah Slater <ns...@apache.org>.
Was this a mistaken commit? Was it resolved?
On 10 October 2012 21:06, Jan Lehnardt <ja...@apache.org> wrote:
> Jason,
>
> did you mean to commit this to Apache?
>
> Cheers
> Jan
> --
>
>
> On Sep 14, 2012, at 04:08 , jhs@apache.org wrote:
>
> > Updated Branches:
> > refs/heads/COUCHDB-1534 [created] 835b57b19
> >
> >
> > Disable checking for string query_params values
> >
> >
> > Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
> > Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/835b57b1
> > Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/835b57b1
> > Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/835b57b1
> >
> > Branch: refs/heads/COUCHDB-1534
> > Commit: 835b57b196d423ae5132a559e727031521da8ce9
> > Parents: 53490d9
> > Author: Jason Smith (work) <jh...@iriscouch.com>
> > Authored: Tue Sep 4 06:35:52 2012 +0000
> > Committer: Jason Smith (air) <jh...@iriscouch.com>
> > Committed: Fri Sep 14 09:02:04 2012 +0700
> >
> > ----------------------------------------------------------------------
> > src/couchdb/couch_httpd_replicator.erl | 6 ++++--
> > 1 files changed, 4 insertions(+), 2 deletions(-)
> > ----------------------------------------------------------------------
> >
> >
> >
> http://git-wip-us.apache.org/repos/asf/couchdb/blob/835b57b1/src/couchdb/couch_httpd_replicator.erl
> > ----------------------------------------------------------------------
> > diff --git a/src/couchdb/couch_httpd_replicator.erl
> b/src/couchdb/couch_httpd_replicator.erl
> > index fb1e350..47de476 100644
> > --- a/src/couchdb/couch_httpd_replicator.erl
> > +++ b/src/couchdb/couch_httpd_replicator.erl
> > @@ -58,8 +58,10 @@ validate_rep_props([]) ->
> > validate_rep_props([{<<"query_params">>, {Params}}|Rest]) ->
> > lists:foreach(fun
> > ({_,V}) when is_binary(V) -> ok;
> > - ({K,_}) -> throw({bad_request,
> > - <<K/binary," value must be a string.">>})
> > + % Disabled to support the iris-monitor replicator
> > + %({K,_}) -> throw({bad_request,
> > + % <<K/binary," value must be a string.">>})
> > + ({K,_}) -> ok
> > end, Params),
> > validate_rep_props(Rest);
> > validate_rep_props([_|Rest]) ->
> >
>
>
--
NS