← Back to branch summary

~ubuntu-branches/ubuntu/lucid/couchdb/lucid

« back to all changes in this revision

Viewing changes to src/ibrowse/ibrowse_http_client.erl

  • Committer: Bazaar Package Importer
  • Author(s): Elliot Murphy
  • Date: 2009-09-10 11:35:54 UTC
  • mfrom: (1.2.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20090910113554-dnk88gci7ap66iyp
Tags: 0.10.0~svn813472-0ubuntu1
https://launchpad.net/bugs/424330
https://launchpad.net/bugs/422178
* New snapshot of couchdb 0.10.x stable prerelease branch
  - pass config reset option to recursed background startup (LP: #424330)
    closes COUCHDB-498
  - Fix for building on snow leopard COUCHDB-490
  - Fix SSL replication (LP: #422178) COUCHDB-491
  - Fix continuous-after-normal replication
  - Use the same password hash calculation for user creation via ini
    file and user db, closes COUCHDB-492
  - Fix for WebKit XHR, closes COUCHDB-483
  - Don't check for response code text, closes COUCHDB-482
  - Remove a debugging leftover

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/ibrowse/ibrowse_http_client.erl
113
113
                   port = Port},
114
114
    put(ibrowse_trace_token, [Host, $:, integer_to_list(Port)]),
115
115
    put(my_trace_flag, ibrowse_lib:get_trace_status(Host, Port)),
 
116
    {ok, State};
 
117
init(#url{host=Host, port=Port, protocol=Protocol}) ->
 
118
    State = #state{
 
119
        host = Host,
 
120
        port = Port,
 
121
        is_ssl = (Protocol == https),
 
122
        ssl_options = [{ssl_imp, new}]
 
123
    },
 
124
    put(ibrowse_trace_token, [Host, $:, integer_to_list(Port)]),
 
125
    put(my_trace_flag, ibrowse_lib:get_trace_status(Host, Port)),
116
126
    {ok, State}.
117
127
 
118
128
%%--------------------------------------------------------------------
137
147
handle_call(stop, _From, State) ->
138
148
    do_close(State),
139
149
    do_error_reply(State, closing_on_request),
140
 
    {stop, normal, ok, State};
 
150
    {stop, normal, ok, State#state{socket=undefined}};
141
151
 
142
152
handle_call(Request, _From, State) ->
143
153
    Reply = {unknown_request, Request},