sjw
/
pleroma
mirror of https://git.pleroma.social/sjw/pleroma.git
1
0
Fork 0
Code Issues Releases Wiki Activity
8,993 Commits 136 Branches 24 Tags 254 MiB
Commit Graph

31 Commits

Author SHA1 Message Date
Your New SJW Waifu cf563451ae Revert "Merge branch 'revert-76fc9276' into 'neckbeard'" 
This reverts merge request !2
 2020-04-03 09:03:38 +00:00
Your New SJW Waifu 02160dbc03 Revert "Merge remote-tracking branch 'upstream/develop' into neckbeard" 
This reverts commit 76fc927650
 2020-04-02 00:57:27 +00:00
Alexander Strizhakov 98ed0d1c4b
more clean up 2020-03-13 09:37:57 +03:00
Alexander Strizhakov 1306b92997
clean up 2020-03-12 18:29:07 +03:00
Alexander Strizhakov f39e1b9eff
add verify tls_opts only when we open connection 
for other requests tesla will add tls_opts
 2020-03-10 15:54:11 +03:00
Alexander Strizhakov 78282dc983
little polishing 2020-03-06 21:24:19 +03:00
Mark Felder 4427161ca3 Merge branch 'develop' into gun 2020-03-03 17:15:49 -06:00
Mark Felder 05da5f5cca Update Copyrights 2020-03-03 16:44:49 -06:00
Alexander Strizhakov f98ee730f0
adapter renaming to adapter_helper 2020-03-03 18:53:44 +03:00
Alexander Strizhakov aaa879ce75
proxy parsing errors 2020-03-03 17:27:22 +03:00
Alexander Strizhakov f604f9e470
hackney pool timeout 2020-02-21 14:33:55 +03:00
Alexander Strizhakov 514c899275
adding gun adapter 2020-02-18 08:19:01 +03:00
Sergey Suprunenko 02dc651828 Handle 303 redirects 2019-07-28 20:24:39 +00:00
rinpatch b001b8891a Merge the default options with custom ones in ReverseProxy and 
Pleroma.HTTP
 2019-07-12 23:52:26 +03:00
jeff 9f3bcf0efe Respect proxy settings federation 2019-05-28 06:49:53 +00:00
William Pitcock c972d0bb14 http: bump connection timeout to 10 seconds 2019-05-21 04:59:15 +00:00
William Pitcock 1f78d23eed http: connection: unify adapter configuration and defaults 2019-03-08 22:59:10 +00:00
William Pitcock ba48bd901c http: connection: relax the timeouts a little 2019-03-08 22:56:16 +00:00
William Pitcock 19afd9f81f http: rework connection timeouts to match hackney docs, enforce 1 second max TCP connection timeout 2019-03-08 22:56:16 +00:00
William Pitcock 50ba4ba2c9 http: connection: merge hackney option lists instead of concatenating them 
this ensures the right pools are used
 2019-03-08 22:56:16 +00:00
href 4aff4efa8d
Use multiple hackney pools 
* federation (ap, salmon)
* media (rich media, media proxy)
* upload (uploader proxy)

Each "part" will stop fighting others ones -- a huge federation outbound
could before make the media proxy fail to checkout a connection in time.

splitted media and uploaded media for the good reason than an upload
pool will have all connections to the same host (the uploader upstream).
it also has a longer default retention period for connections.
 2019-01-30 15:06:46 +01:00
lain 096a927805 Merge remote-tracking branch 'origin/develop' into pool-usage 2019-01-01 14:19:55 +01:00
lain d4799e0dc2 Remove default pool, it's used automatically anyway. 2019-01-01 13:49:24 +01:00
William Pitcock 980b5288ed update copyright years to 2019 2018-12-31 15:41:47 +00:00
William Pitcock 2791ce9a1f add license boilerplate to pleroma core 2018-12-23 20:56:42 +00:00
Maksim Pechnikov 074fa790ba fix compile warnings 2018-12-09 20:50:08 +03:00
Hakaba Hitoyo 96ba95df2e remove follow_redirect options 2018-12-06 11:38:33 +09:00
Hakaba Hitoyo 27792b2d77 remove pool and timeout options which duplicate with the default 2018-12-06 11:23:15 +09:00
Maksim Pechnikov dd8aee332c formatting the code 2018-12-04 17:48:55 +03:00
Maksim Pechnikov ec34de0c1f WebSub fix test 2018-12-04 14:03:32 +03:00
Maksim Pechnikov 3ce16e5a56 init tesla and updated the http requests in Pleroma.Web.Websub 2018-12-04 14:03:32 +03:00