Mark Felder
563718cab9
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into media-preview-proxy
2020-09-06 08:15:34 -05:00
Ivan Tashkinov
759f8bc3ae
[ #2497 ] Fixed MediaProxyWarmingPolicyTest.
2020-09-06 15:30:11 +03:00
rinpatch
047a60c46e
Merge branch 'hotfix-the-hotfix' into 'develop'
...
ConnectionPool: fix the previous hotfix
See merge request pleroma/pleroma!2959
2020-09-05 19:04:19 +00:00
rinpatch
129a2f48df
ConnectionPool middleware: handle connection opening errors
2020-09-05 21:36:17 +03:00
rinpatch
9d6aca5bee
ConnectionPool: fix the previous hotfix
...
I rushed the hotfix and forgot how `pop_in` actually works,
I want to die. We need some integration tests for the HTTP client
2020-09-05 21:27:06 +03:00
rinpatch
b42869424f
Merge branch 'hotfix/tesla-env-no-access' into 'develop'
...
ConnectionPool middleware: fix a crash due to unimplemented behaviour
See merge request pleroma/pleroma!2958
2020-09-05 18:18:49 +00:00
rinpatch
5298de3be6
ConnectionPool middleware: fix a crash due to unimplemented behaviour
...
Structs don't implement Access behaviour, so this crashed. Tests didn't
catch it and I didn't test that part of the codepath. Very sorry
2020-09-05 21:17:03 +03:00
rinpatch
8c8fb84a38
Merge branch 'fix/pool-middleware-reverseproxy-leak' into 'develop'
...
ConnectionPool middleware: Fix connection leak on ReverseProxy redirects
See merge request pleroma/pleroma!2954
2020-09-05 17:47:12 +00:00
Ivan Tashkinov
88a6ee4a59
[ #2497 ] Func defs grouping fix.
2020-09-05 20:23:18 +03:00
Ivan Tashkinov
f170d47130
[ #2497 ] Adjusted media proxy preview invalidation. Allowed client-side caching for media preview. Adjusted prewarmer to fetch only proxiable URIs.
...
Removed :preview pool in favor of existing :media one. Misc. refactoring.
2020-09-05 20:19:09 +03:00
Ivan Tashkinov
c3b02341bf
[ #2497 ] Made media preview proxy fall back to media proxy instead of to source url. Adjusted tests. Refactoring.
2020-09-05 16:16:35 +03:00
Haelwenn
da4660d2bf
Merge branch 'use-https-in-dockerfile' into 'develop'
...
Use TLS when adding Alpine community repository in Dockerfile
See merge request pleroma/pleroma!2955
2020-09-05 03:10:54 +00:00
James Alseth
9fd0e5e0dd
Use TLS when adding Alpine community repository in Dockerfile
2020-09-04 19:19:56 -07:00
rinpatch
10da13c713
ConnectionPool middleware: Fix connection leak on ReverseProxy redirects
...
Requires a patched Tesla due to upstream not saving opts between
redirects, patch submitted at https://github.com/teamon/tesla/pull/414
2020-09-04 22:10:40 +03:00
lain
2cd2a8fda3
Merge branch 'develop' into 'develop'
...
Added cmake
See merge request pleroma/pleroma!2953
2020-09-04 18:19:23 +00:00
Farhan Khan
173b04df48
Added cmake
2020-09-04 18:03:58 +00:00
Haelwenn
2b04cdf407
Merge branch 'feat/simplify-pool-managment' into 'develop'
...
HTTP: radically simplify pool checkin/checkout
See merge request pleroma/pleroma!2948
2020-09-04 10:27:46 +00:00
rinpatch
5dde1fdae2
Merge branch 'chore/fast_html-bump' into 'develop'
...
mix.lock: Bump fast_html
See merge request pleroma/pleroma!2950
2020-09-04 07:17:10 +00:00
Haelwenn (lanodan) Monnier
bce22937dc
mix.lock: Bump fast_html
...
This update fixes an incorrect push to Hex that reverted the gcc-10 fix
2020-09-04 09:15:58 +02:00
rinpatch
d34fe2840d
HTTP: radically simplify pool checkin/checkout
...
Use a custom tesla middleware instead of adapter helper function +
custom redirect middleware.
This will also fix "Client died before releasing the connection"
messages when the request pool is overloaded. Since the checkout is
now done after passing ConcurrentLimiter.
This is technically less efficient, since the connection needs to be
checked in/out every time the middleware is left or entered respectively.
But I don't think the nanoseconds we might lose on redirects
to the same host are worth the complexity.
2020-09-03 23:44:13 +03:00
Mark Felder
f25b0e87f3
URL passed to helper is already MediaProxy
...
Set :preview pool on the request
2020-09-03 15:28:57 -05:00
Mark Felder
b529616e11
Increase pool and timeout for preview so it catches slow media pool responses
2020-09-03 15:08:12 -05:00
Mark Felder
d1e1057e22
Merge branch 'media-preview-proxy' of git.pleroma.social:pleroma/pleroma into feld-media-preview-proxy
2020-09-03 14:48:43 -05:00
Mark Felder
6141eb94ab
Fetch preview requests through the MediaProxy. Separate connection options are not needed.
...
Use a separate pool for preview requests
2020-09-03 14:42:11 -05:00
Ivan Tashkinov
60c925380d
[ #2497 ] Added support for enforcing output format for media proxy preview, used for avatar_static & header_static (AccountView).
2020-09-03 20:13:29 +03:00
Mark Felder
85446cc30c
Merge branch 'develop' into media-preview-proxy
2020-09-03 10:34:06 -05:00
lain
9433311923
Merge branch 'bugfix/incoming-poll-emoji' into 'develop'
...
Fix emoji in Question, force generated context/context_id insertion
Closes #1870
See merge request pleroma/pleroma!2915
2020-09-03 11:50:30 +00:00
lain
1d743ca829
Merge branch 'fix_install_fe_bug' into 'develop'
...
Fix frontend install mix task bug
See merge request pleroma/pleroma!2942
2020-09-03 09:56:17 +00:00
lain
5da3677607
Frontend mix task: Add tests.
2020-09-03 11:40:17 +02:00
lain
f26b580e80
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into seanking/pleroma-fix_install_fe_bug
2020-09-03 11:29:39 +02:00
feld
d1a6f67b1d
Merge branch 'fix/2095-deactivated-account-reset' into 'develop'
...
Disallow password resets for deactivated accounts
Closes #2095
See merge request pleroma/pleroma!2935
2020-09-02 17:11:24 +00:00
lain
0ab03e8564
Merge branch 'fix/1991-tzdata-update' into 'develop'
...
user agent if Endpoint is not started yet
Closes #1991
See merge request pleroma/pleroma!2945
2020-09-02 17:09:55 +00:00
lain
119e11f455
Merge branch 'bugfix/mastoapi-lists' into 'develop'
...
Fix removing an account from a list
Closes #2103
See merge request pleroma/pleroma!2940
2020-09-02 17:03:45 +00:00
lain
581f382e71
ListController: DRY up stuff.
2020-09-02 18:32:00 +02:00
Mark Felder
cbf7f0e029
Disallow password resets for deactivated accounts.
...
Ensure all responses to password reset events are identical.
2020-09-02 09:09:13 -05:00
rinpatch
d6e979aebe
Merge branch 'feat/rich-media-improvements' into 'develop'
...
Rich media improvements
See merge request pleroma/pleroma!2944
2020-09-02 13:46:11 +00:00
rinpatch
d48fc90978
StatusView: Start fetching rich media cards as soon as possible
2020-09-02 16:45:54 +03:00
Alexander Strizhakov
a11f23c130
user agent if Endpoint is not started yet
2020-09-02 15:45:47 +03:00
rinpatch
19691389b9
Rich media: Add failure tracking
2020-09-02 14:59:52 +03:00
rinpatch
46236d1d87
html.ex: optimize external url extraction
...
By using a :not() selector and only extracting attributes from the
first match.
2020-09-02 12:45:20 +03:00
rinpatch
47ff425cfd
Merge branch 'fix/2047-rich-media-parser' into 'develop'
...
RichMedia parser fix
Closes #2047
See merge request pleroma/pleroma!2941
2020-09-02 09:38:43 +00:00
rinpatch
b2d776d77d
Merge branch 'http-fixes' into 'develop'
...
Improvements and fixes for http requests
See merge request pleroma/pleroma!2904
2020-09-02 09:36:56 +00:00
Alexander Strizhakov
84fbf16161
timeout option moved to gun adapter helper
2020-09-02 10:50:51 +03:00
Alexander Strizhakov
1c57ef4498
default pool for tz_data client
2020-09-02 10:33:43 +03:00
rinpatch
96de4bfbca
Merge branch 'fix-searching-following' into 'develop'
...
search: fix 'following' query parameter
See merge request pleroma/pleroma!2943
2020-09-02 06:55:58 +00:00
Alexander Strizhakov
79f65b4374
correct pool and uniform headers format
2020-09-02 09:16:51 +03:00
Alexander Strizhakov
5e8adf91b4
don't overwrite passed pool option in http clients
2020-09-02 09:04:23 +03:00
Alexander Strizhakov
c17d83cd73
improvements and fixes for http requests
...
- fix for gun worker termination in some circumstances
- pool for http clients (ex_aws, tzdata)
- default pool timeouts for gun
- gun retries on gun_down messages
- s3 upload timeout if streaming enabled
2020-09-02 09:04:23 +03:00
Karol Kosek
868057871a
search: fix 'following' query parameter
...
The parameter included the accounts that are following you (followers)
instead of those you are actually following.
Co-Authored-By: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
2020-09-02 02:08:43 +02:00
Ivan Tashkinov
6ce28c4091
[ #2497 ] Fix for png media proxy preview response headers (content-type & content-disposition).
2020-09-01 21:21:58 +03:00
