summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-03-16 15:36:17 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-03-16 15:36:17 +0000
commit6837c02602e71259ed27990c7912ce4b6e4cdee1 (patch)
tree2b5ca25b034bbb48acc24d7121cf4f30b5b44e99
parentFix typo in domain name in account_threepid_delegates config option (#6273) (diff)
parentFix small typo in comment (#6269) (diff)
downloadsynapse-6837c02602e71259ed27990c7912ce4b6e4cdee1.tar.xz
Fix small typo in comment (#6269)
* commit '7955abeaa':
  Fix small typo in comment (#6269)
-rw-r--r--changelog.d/6269.misc1
-rw-r--r--synapse/federation/federation_server.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/6269.misc b/changelog.d/6269.misc
new file mode 100644
index 0000000000..9fd333cc89
--- /dev/null
+++ b/changelog.d/6269.misc
@@ -0,0 +1 @@
+Fix incorrect comment regarding the functionality of an `if` statement.
\ No newline at end of file
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py
index 7c331753ad..d5a19764d2 100644
--- a/synapse/federation/federation_server.py
+++ b/synapse/federation/federation_server.py
@@ -145,7 +145,7 @@ class FederationServer(FederationBase):
 
         logger.debug("[%s] Transaction is new", transaction.transaction_id)
 
-        # Reject if PDU count > 50 and EDU count > 100
+        # Reject if PDU count > 50 or EDU count > 100
         if len(transaction.pdus) > 50 or (
             hasattr(transaction, "edus") and len(transaction.edus) > 100
         ):