File tree Expand file tree Collapse file tree 6 files changed +26
-21
lines changed
Expand file tree Collapse file tree 6 files changed +26
-21
lines changed Original file line number Diff line number Diff line change 1+ ## Update to ponylang/http 0.6.0
2+
3+ We've updated our ` ponylang/http ` dependency to 0.6.0. This includes a fix that will allow correct operation when using OpenSSL 3.2.
Original file line number Diff line number Diff line change 1212 },
1313 {
1414 "locator" : " github.com/ponylang/http.git" ,
15- "version" : " 0.5.4 "
15+ "version" : " 0.6.0 "
1616 },
1717 {
1818 "locator" : " github.com/ponylang/json.git" ,
Original file line number Diff line number Diff line change @@ -132,21 +132,19 @@ actor PaginatedResultReceiver[A: Any val]
132132// TODO: Could this be more generic?
133133class PaginatedJsonRequester
134134 let _auth: TCPConnectAuth
135- let _client: HTTPClient
135+ let _sslctx: ( SSLContext | None )
136136
137137 new create (auth: TCPConnectAuth ) =>
138138 _auth = auth
139139
140- let sslctx = try
140+ _sslctx = try
141141 recover val
142142 SSLContext .>set_client_verify (true ).>set_authority (None )?
143143 end
144144 else
145145 None
146146 end
147147
148- _client = HTTPClient (_auth, sslctx)
149-
150148 fun ref apply [A : Any val ](url: String ,
151149 receiver: PaginatedResultReceiver [A ]) ?
152150 =>
@@ -155,7 +153,8 @@ class PaginatedJsonRequester
155153
156154 let handler_factory =
157155 PaginatedJsonRequesterHandlerFactory [A ](_auth, receiver)
158- _client (consume r, handler_factory)?
156+ let client = HTTPClient (_auth, handler_factory, _sslctx)
157+ client (consume r)?
159158
160159class PaginatedJsonRequesterHandlerFactory [A : Any val ] is HandlerFactory
161160 let _auth: TCPConnectAuth
Original file line number Diff line number Diff line change @@ -8,19 +8,20 @@ interface tag DeleteResultReceiver
88 be failure (status: U16 , response_body: String , message: String )
99
1010class HTTPDelete
11- let _client: HTTPClient
11+ let _auth: TCPConnectAuth
12+ let _sslctx: (SSLContext | None )
1213
1314 new create (auth: TCPConnectAuth ) =>
14- let sslctx = try
15+ _auth = auth
16+
17+ _sslctx = try
1518 recover val
1619 SSLContext .>set_client_verify (true ).>set_authority (None )?
1720 end
1821 else
1922 None
2023 end
2124
22- _client = HTTPClient (auth, sslctx)
23-
2425 fun ref apply (url: String ,
2526 receiver: DeleteResultReceiver ,
2627 auth_token: (String | None ) = None ) ?
@@ -29,7 +30,8 @@ class HTTPDelete
2930 let r = RequestFactory (" DELETE" , valid_url, auth_token)
3031
3132 let handler_factory = HTTPDeleteHandlerFactory (receiver)
32- _client (consume r, handler_factory)?
33+ let client = HTTPClient (_auth, handler_factory, _sslctx)
34+ client (consume r)?
3335
3436class HTTPDeleteHandlerFactory is HandlerFactory
3537 let _receiver: DeleteResultReceiver
Original file line number Diff line number Diff line change @@ -6,29 +6,28 @@ use "promises"
66
77class JsonRequester
88 let _auth: TCPConnectAuth
9- let _client: HTTPClient
9+ let _sslctx: ( SSLContext | None )
1010
1111 new create (auth: TCPConnectAuth ) =>
1212 _auth = auth
1313
14- let sslctx = try
14+ _sslctx = try
1515 recover val
1616 SSLContext .>set_client_verify (true ).>set_authority (None )?
1717 end
1818 else
1919 None
2020 end
2121
22- _client = HTTPClient (_auth, sslctx)
23-
2422 fun ref apply (url: String ,
2523 receiver: JsonRequesterResultReceiver ) ?
2624 =>
2725 let valid_url = URL .valid (url)?
2826 let r = RequestFactory (" GET" , valid_url)
2927
3028 let handler_factory = JsonRequesterHandlerFactory (_auth, receiver)
31- _client (consume r, handler_factory)?
29+ let client = HTTPClient (_auth, handler_factory, _sslctx)
30+ client (consume r)?
3231
3332interface tag JsonRequesterResultReceiver
3433 be success (json: JsonDoc val )
Original file line number Diff line number Diff line change @@ -8,19 +8,20 @@ interface tag PostResultReceiver
88 be failure (status: U16 , response_body: String , message: String )
99
1010class HTTPPost
11- let _client: HTTPClient
11+ let _auth: TCPConnectAuth
12+ let _sslctx: (SSLContext | None )
1213
1314 new create (auth: TCPConnectAuth ) =>
14- let sslctx = try
15+ _auth = auth
16+
17+ _sslctx = try
1518 recover val
1619 SSLContext .>set_client_verify (true ).>set_authority (None )?
1720 end
1821 else
1922 None
2023 end
2124
22- _client = HTTPClient (auth, sslctx)
23-
2425 fun ref apply (url: String ,
2526 body: String ,
2627 receiver: PostResultReceiver ,
@@ -31,7 +32,8 @@ class HTTPPost
3132 r.add_chunk (body)
3233
3334 let handler_factory = HTTPPostHandlerFactory (receiver)
34- _client (consume r, handler_factory)?
35+ let client = HTTPClient (_auth, handler_factory, _sslctx)
36+ client (consume r)?
3537
3638class HTTPPostHandlerFactory is HandlerFactory
3739 let _receiver: PostResultReceiver
You can’t perform that action at this time.
0 commit comments