Change previous usage of cloudi_request_info for ResponseInfo parsing to use cloudi_response_info.

Author: okeuday

rebar.config

@@ -4,16 +4,16 @@
 {deps,
  [{cloudi_core, ".*",
    {git, "https://github.com/CloudI/cloudi_core.git",
-    {tag, "v1.8.0"}}},
+    {branch, "master"}}},
   {cowboy, ".*",
    {git, "https://github.com/ninenines/cowboy.git",
     {tag, "1.1.2"}}},
   {uuid, ".*",
    {git, "https://github.com/okeuday/uuid.git",
-    {tag, "v1.8.0"}}},
+    {branch, "master"}}},
   {trie, ".*",
    {git, "https://github.com/okeuday/trie.git",
-    {tag, "v1.8.0"}}}]}.
+    {branch, "master"}}}]}.
 
 {erl_opts,
  [debug_info,

src/cloudi_http_cowboy1_handler.erl

@@ -8,7 +8,7 @@
 %%%
 %%% MIT License
 %%%
-%%% Copyright (c) 2012-2018 Michael Truog <mjtruog at protonmail dot com>
+%%% Copyright (c) 2012-2020 Michael Truog <mjtruog at protonmail dot com>
 %%%
 %%% Permission is hereby granted, free of charge, to any person obtaining a
 %%% copy of this software and associated documentation files (the "Software"),
@@ -29,8 +29,8 @@
 %%% DEALINGS IN THE SOFTWARE.
 %%%
 %%% @author Michael Truog <mjtruog at protonmail dot com>
-%%% @copyright 2012-2018 Michael Truog
-%%% @version 1.7.5 {@date} {@time}
+%%% @copyright 2012-2020 Michael Truog
+%%% @version 1.8.1 {@date} {@time}
 %%%------------------------------------------------------------------------
 
 -module(cloudi_http_cowboy1_handler).
@@ -146,7 +146,6 @@ handle(Req0,
                     if
                         (OutputType =:= external) orelse
                         (OutputType =:= binary) orelse (OutputType =:= list) ->
-                            % cloudi_request_info text_pairs format
                             {get_query_string_external(QSVals), Req3};
                         OutputType =:= internal ->
                             % cloudi_key_value format
@@ -900,12 +899,7 @@ header_content_type(Headers) ->
 
 % format for external services, http headers passed as key-value pairs
 headers_external_incoming(L) ->
-    erlang:iolist_to_binary(headers_external_incoming_text(L)).
-
-headers_external_incoming_text([] = L) ->
-    L;
-headers_external_incoming_text([{K, V} | L]) when is_binary(K) ->
-    [[K, 0, V, 0] | headers_external_incoming_text(L)].
+    cloudi_request_info:key_value_new(L, text_pairs).
 
 headers_external_outgoing(<<>>) ->
     [];
@@ -917,29 +911,10 @@ headers_external_outgoing([{_, _} | _] = ResponseInfo) ->
     ResponseInfo;
 headers_external_outgoing(ResponseInfo)
     when is_binary(ResponseInfo) ->
-    headers_external_outgoing_text(binary:split(ResponseInfo, <<0>>, [global])).
-
-headers_external_outgoing_text([<<>>]) ->
-    [];
-headers_external_outgoing_text([K, <<>>]) ->
-    [{K, <<>>}];
-headers_external_outgoing_text([K, V | L]) ->
-    [{K, V} | headers_external_outgoing_text(L)].
+    cloudi_response_info:key_value_parse(ResponseInfo, list).
 
-get_query_string_external([]) ->
-    <<>>;
 get_query_string_external(QsVals) ->
-    erlang:iolist_to_binary(get_query_string_external_text(QsVals)).
-
-get_query_string_external_text([] = L) ->
-    L;
-get_query_string_external_text([{K, V} | L]) ->
-    if
-        V =:= true ->
-            [[K, 0, <<"true">>, 0] | get_query_string_external_text(L)];
-        is_binary(V) ->
-            [[K, 0, V, 0] | get_query_string_external_text(L)]
-    end.
+    cloudi_request_info:key_value_new(QsVals, text_pairs).
 
 request_time_start() ->
     cloudi_timestamp:microseconds_monotonic().