Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Commit 3729b15

Browse files
anoadragon453anoadragon453
committed
Merge commit '2983049a7' into anoa/dinsic_release_1_21_x
* commit '2983049a7': Factor out `_send_dummy_event_for_room` (#8370) Improve logging of state resolution (#8371) Fix bug which caused failure on join with malformed membership events (#8385) Use `async with` for ID gens (#8383) Don't push if an user account has expired (#8353) Do not check lint/test dependencies at runtime. (#8377) Add note to reverse_proxy.md about disabling Apache's mod_security2 (#8375) Changelog
2 parents e529fa7 + 2983049 commit 3729b15

32 files changed

+293
-224
lines changed

‎changelog.d/8330.misc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Move lint-related dependencies to package-extra field, update CONTRIBUTING.md to utilise this.
1+
Move lint-related dependencies to package-extra field, update CONTRIBUTING.md to utilise this.

‎changelog.d/8353.bugfix‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Don't send push notifications to expired user accounts.

‎changelog.d/8370.misc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Factor out a `_send_dummy_event_for_room` method.

‎changelog.d/8371.misc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Improve logging of state resolution.

‎changelog.d/8373.bugfix‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Include `guest_access` in the fields that are checked for null bytes when updating `room_stats_state`. Broke in v1.7.2.

‎changelog.d/8375.doc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Add note to the reverse proxy settings documentation about disabling Apache's mod_security2. Contributed by Julian Fietkau (@jfietkau).

‎changelog.d/8377.misc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Move lint-related dependencies to package-extra field, update CONTRIBUTING.md to utilise this.

‎changelog.d/8383.misc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Refactor ID generators to use `async with` syntax.

‎changelog.d/8385.bugfix‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix a bug which could cause errors in rooms with malformed membership events, on servers using sqlite.

‎docs/reverse_proxy.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,14 @@ example.com:8448 {
121121

122122
**NOTE**: ensure the `nocanon` options are included.
123123

124+
**NOTE 2**: It appears that Synapse is currently incompatible with the ModSecurity module for Apache (`mod_security2`). If you need it enabled for other services on your web server, you can disable it for Synapse's two VirtualHosts by including the following lines before each of the two `</VirtualHost>` above:
125+
126+
```
127+
<IfModule security2_module>
128+
SecRuleEngine off
129+
</IfModule>
130+
```
131+
124132
### HAProxy
125133

126134
```

0 commit comments

Comments
 (0)