summary refs log tree commit diff
path: root/synapse/http (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* Merge pull request #4546 from matrix-org/rav/silence_critical_error_from_fede...Richard van der Hoff2019-02-011-2/+15
|\
| * Fix noisy "twisted.internet.task.TaskStopped" errors in logsRichard van der Hoff2019-02-011-2/+15
* | Merge pull request #4544 from matrix-org/rav/skip_invalid_well_knownRichard van der Hoff2019-02-011-19/+6
|\ \
| * | Treat an invalid .well-known the same as an absent oneRichard van der Hoff2019-02-011-19/+6
* | | Fix b'ab' noise in logsRichard van der Hoff2019-02-011-1/+1
|/ /
* | Cache failures to parse .well-knownRichard van der Hoff2019-02-011-13/+43
* | better logging for federation connectionsRichard van der Hoff2019-01-311-5/+16
* | Update federation routing logic to check .well-known before SRVRichard van der Hoff2019-01-311-5/+5
|/
* Merge pull request #4521 from matrix-org/rav/fed_routing/cleanupsRichard van der Hoff2019-01-301-9/+11
|\
| * fix exception textRichard van der Hoff2019-01-301-1/+1
| * Also jitter the invalid cache periodRichard van der Hoff2019-01-301-9/+11
* | Follow redirects on .well-known (#4520)Richard van der Hoff2019-01-301-2/+4
|/
* Add a caching layer to .well-known responses (#4516)Richard van der Hoff2019-01-301-2/+88
* Relax requirement for a content-type on .well-known (#4511)Richard van der Hoff2019-01-291-20/+13
* Implement MSC1708 (.well-known lookups for server routing) (#4489)Richard van der Hoff2019-01-291-4/+110
* docstrings for _RoutingResultRichard van der Hoff2019-01-281-0/+36
* Handle IP literals explicitlyRichard van der Hoff2019-01-281-0/+19
* MatrixFederationAgent: factor out routing logicRichard van der Hoff2019-01-281-18/+62
* Fix idna and ipv6 literal handling in MatrixFederationAgent (#4487)Richard van der Hoff2019-01-281-11/+12
* Fix Host header sent by MatrixFederationAgent (#4468)Richard van der Hoff2019-01-252-1/+10
* Merge pull request #4464 from matrix-org/rav/fix_srv_lookupRichard van der Hoff2019-01-241-1/+2
|\
| * Look up the right SRV recordRichard van der Hoff2019-01-241-1/+2
* | Fix UnboundLocalError in post_urlencoded_get_json (#4460)Richard van der Hoff2019-01-241-2/+3
|/
* put resolve_service in an objectRichard van der Hoff2019-01-222-63/+86
* Require that service_name be a byte stringRichard van der Hoff2019-01-221-4/+4
* Kill off matrix_federation_endpointRichard van der Hoff2019-01-222-145/+0
* Make MatrixFederationClient use MatrixFederationAgentRichard van der Hoff2019-01-221-27/+10
* MatrixFederationAgentRichard van der Hoff2019-01-222-0/+147
* Refactor and bugfix for resove_service (#4427)Richard van der Hoff2019-01-223-72/+141
* Remove redundant WrappedConnection (#4409)Richard van der Hoff2019-01-182-86/+19
* sign_request -> build_auth_headers (#4408)Richard van der Hoff2019-01-171-12/+11
* Fixup docstrings for matrixfederationclientErik Johnston2019-01-091-68/+73
* Use RequestSendFailed when fail to parse content type headersErik Johnston2019-01-081-5/+5
* Refactor request sending to have better excpetions (#4358)Erik Johnston2019-01-081-33/+72
* Fix IP URL previews on Python 3 (#4215)Amber Brown2018-12-222-169/+243
* fix parse_string docstringRichard van der Hoff2018-11-081-5/+4
* Fix URL preview bugs (type error when loading cache from db, content-type inc...Amber Brown2018-11-081-4/+4
* Merge pull request #3969 from turt2live/travis/fix-federated-group-requestsTravis Ralston2018-10-231-6/+6
|\
| * Merge branch 'develop' into travis/fix-federated-group-requestsTravis Ralston2018-10-121-6/+21
| |\
| * | Fix exception documentation in matrixfederationclient.pyTravis Ralston2018-09-261-6/+6
* | | Make the metrics less racy (#4061)Amber Brown2018-10-191-13/+18
* | | Various cleanups in the federation client code (#4031)Richard van der Hoff2018-10-161-38/+40
| |/ |/|
* | Fix error when logging incomplete requestsErik Johnston2018-10-021-6/+21
|/
* Merge pull request #3925 from matrix-org/erikj/fix_producers_unregisteredRichard van der Hoff2018-09-251-14/+35
|\
| * Fix spurious exceptions when client closes conncetionErik Johnston2018-09-201-14/+35
* | Fix client IPs being broken on Python 3 (#3908)Amber Brown2018-09-201-1/+1
|/
* Add a regression test for logging on failed connections (#3912)Amber Brown2018-09-201-2/+2
* Update to use new timeout function everywhere.Erik Johnston2018-09-192-12/+17
* Merge pull request #3909 from turt2live/travis/fix-logging-1Amber Brown2018-09-191-4/+4
|\
| * Destination is a stringTravis Ralston2018-09-181-4/+4
* | Merge pull request #3907 from matrix-org/rav/set_sni_to_server_nameAmber Brown2018-09-191-3/+10
|\ \ | |/ |/|
| * Set SNI to the server_name, not whatever was in the SRV recordRichard van der Hoff2018-09-181-3/+10
* | Refactor matrixfederationclient to fix logging (#3906)Richard van der Hoff2018-09-181-149/+236
|/
* Fix more b'abcd' noise in metricsRichard van der Hoff2018-09-172-12/+12
* Fix some b'abcd' noise in logs and metricsRichard van der Hoff2018-09-172-5/+8
* Add an awful secondary timeout to fix wedged requestsErik Johnston2018-09-141-0/+11
* Merge pull request #3872 from matrix-org/hawkowl/timeouts-2Erik Johnston2018-09-144-7/+12
|\
| * fixAmber Brown2018-09-151-3/+3
| * fixAmber Brown2018-09-141-1/+4
| * fixAmber Brown2018-09-141-1/+1
| * redact betterAmber Brown2018-09-141-2/+2
| * we do that higher upAmber Brown2018-09-141-0/+1
| * Merge remote-tracking branch 'origin/develop' into hawkowl/timeouts-2Amber Brown2018-09-141-4/+10
| |\
| * | buffer?Amber Brown2018-09-141-1/+2
* | | Measure outbound requestsErik Johnston2018-09-141-3/+6
| |/ |/|
* | merge (#3576)Amber Brown2018-09-141-4/+10
|/
* Attempt to figure out what's going on with timeouts (#3857)Amber Brown2018-09-141-56/+42
* Log outbound requests when we retryErik Johnston2018-09-121-75/+74
* Timeout reading body for outbound HTTP requestsErik Johnston2018-09-121-7/+45
* Port http/ to Python 3 (#3771)Amber Brown2018-09-063-173/+117
* Fix bug when federation_domain_whitelist is an emtpy listErik Johnston2018-08-241-1/+1
* Merge tag 'v0.33.3rc2' into developRichard van der Hoff2018-08-211-1/+7
|\
| * Fix exceptions when a connection is closed before we read the headersRichard van der Hoff2018-08-201-1/+7
* | Fix typoErik Johnston2018-08-211-4/+4
* | Make the in flight requests metrics thread safeErik Johnston2018-08-201-3/+10
|/
* Port over enough to get some sytests running on Python 3 (#3668)Amber Brown2018-08-202-16/+44
* Merge pull request #3701 from matrix-org/rav/use_producer_for_responsesRichard van der Hoff2018-08-171-4/+13
|\
| * Use a producer to stream back responsesRichard van der Hoff2018-08-151-4/+13
* | Refactor request logging codeRichard van der Hoff2018-08-152-92/+179
|/
* Rename async to async_helpers because `async` is a keyword on Python 3.7 (#3678)Amber Brown2018-08-102-2/+2
* Merge pull request #3439 from vojeroen/send_sni_for_federation_requestsRichard van der Hoff2018-08-102-8/+8
|\
| * Merge branch 'develop' into send_sni_for_federation_requestsRichard van der Hoff2018-07-273-8/+14
| |\
| * \ Merge remote-tracking branch 'upstream/develop' into send_sni_for_federation_...Jeroen2018-07-148-160/+105
| |\ \
| * \ \ Merge branch 'develop' into send_sni_for_federation_requestsJeroen2018-07-096-21/+103
| |\ \ \
| * | | | allow self-signed certificatesJeroen2018-06-261-1/+1
| * | | | formatting changes for pep8Jeroen2018-06-252-2/+3
| * | | | send SNI for federation requestsJeroen2018-06-242-8/+7
* | | | | include known room versions in outgoing make_joinsRichard van der Hoff2018-08-061-2/+5
* | | | | Kill off MatrixCodeMessageExceptionRichard van der Hoff2018-08-011-34/+27
* | | | | Be more careful which errors we send back over the C-S APIRichard van der Hoff2018-08-011-9/+5
* | | | | Python 3: Convert some unicode/bytes uses (#3569)Amber Brown2018-08-022-11/+34
| |_|_|/ |/| | |
* | | | Move v1-only APIs into their own module & isolate deprecated ones (#3460)Amber Brown2018-07-191-2/+4
* | | | pep8Erik Johnston2018-07-181-1/+2
* | | | Add response code to response timer metricsErik Johnston2018-07-181-3/+5
* | | | Refactor REST API tests to use explicit reactors (#3351)Amber Brown2018-07-171-2/+3
* | | | rerun isort with latest versionKrombel2018-07-161-3/+1
* | | | check isort by travisKrombel2018-07-162-2/+4
| |_|/ |/| |
* | | rename assert_params_in_request to assert_params_in_dictKrombel2018-07-131-1/+1
* | | Refactor logcontext resource usage tracking (#3501)Richard van der Hoff2018-07-102-81/+26
* | | run isortAmber Brown2018-07-098-78/+78
| |/ |/|
* | More server_name validationRichard van der Hoff2018-07-041-5/+42
* | Reject invalid server names (#3480)Richard van der Hoff2018-07-031-3/+31
* | replace invalid utf8 with \ufffdMatthew Hodgson2018-07-021-2/+2
* | a fix which doesn't NPE everywhereMatthew Hodgson2018-07-011-9/+17
* | don't mix unicode strings with utf8-in-byte-stringsMatthew Hodgson2018-07-011-2/+9
* | Attempt to be more performant on PyPy (#3462)Amber Brown2018-06-284-8/+8
* | Need to pass reactor to endpoint facErik Johnston2018-06-251-1/+1
* | Remove all global reactor imports & pass it around explicitly (#3424)Amber Brown2018-06-251-7/+9
|/
* Merge pull request #3419 from matrix-org/rav/events_per_requestRichard van der Hoff2018-06-221-1/+4
|\
| * Log number of events fetched from DBRichard van der Hoff2018-06-211-1/+4
* | Pass around the reactor explicitly (#3385)Amber Brown2018-06-222-5/+6
|/
* Fix inflight requests metric (incorrect name & traceback) (#3413)Amber Brown2018-06-201-3/+7
* Merge pull request #3276 from matrix-org/dbkr/unbindDavid Baker2018-06-111-2/+23
|\
| * pep8David Baker2018-06-061-3/+3
| * More doc fixesDavid Baker2018-06-061-2/+2
| * fix pep8David Baker2018-06-051-3/+5
| * doc fixesDavid Baker2018-06-051-6/+6
| * DocstringDavid Baker2018-06-041-0/+14
| * Merge remote-tracking branch 'origin/develop' into dbkr/unbindDavid Baker2018-05-241-3/+5
| |\
| * | Hit the 3pid unbind endpoint on deactivationDavid Baker2018-05-231-2/+7
* | | redact_uri in two missed log pathsMichael Telatynski2018-06-061-2/+2
* | | factor out uri redaction into a method on httpMichael Telatynski2018-06-053-13/+17
* | | Strip `access_token` from outgoing requests using existing regexMichael Telatynski2018-06-021-1/+6
* | | update to more consistently use seconds in any metrics or loggingAmber Brown2018-05-281-19/+19
* | | update metrics to be in secondsAmber Brown2018-05-282-13/+13
* | | Merge remote-tracking branch 'origin/develop' into 3218-official-promAmber Brown2018-05-282-4/+6
|\ \ \
| * \ \ Merge pull request #3246 from NotAFile/py3-repr-stringAmber Brown2018-05-241-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | use repr, not strAdrian Tschira2018-05-191-1/+1
| * | | Merge pull request #3243 from NotAFile/py3-six-3Erik Johnston2018-05-241-3/+5
| |\ \ \ | | |_|/ | |/| |
| | * | Replace some more comparisons with sixAdrian Tschira2018-05-191-3/+5
| | |/
* | | fixesAmber Brown2018-05-231-7/+7
* | | cleanupAmber Brown2018-05-222-3/+6
* | | cleanup pep8 errorsAmber Brown2018-05-221-28/+86
* | | cleanups, self-registrationAmber Brown2018-05-221-12/+3
* | | Merge remote-tracking branch 'origin/develop' into 3218-official-promAmber Brown2018-05-223-4/+213
|\| |
| * | Don't store contextErik Johnston2018-05-221-8/+5
| * | Move in_flight_requests_count to be a callback metricErik Johnston2018-05-221-10/+21
| * | Add in flight request metricsErik Johnston2018-05-212-2/+154
| |/
| * Merge pull request #3213 from matrix-org/rav/consent_handlerRichard van der Hoff2018-05-161-2/+74
| |\
| | * ConsentResource to gather policy consent from usersRichard van der Hoff2018-05-151-2/+74
* | | rest of the changesAmber Brown2018-05-212-85/+25
* | | replacing portionsAmber Brown2018-05-212-24/+10
|/ /
* / Set Server header in SynapseRequestRichard van der Hoff2018-05-103-13/+15
|/
* Remove redundant request_handler decoratorRichard van der Hoff2018-05-102-9/+4
* Factor wrap_request_handler_with_logging out of wrap_request_handlerRichard van der Hoff2018-05-101-54/+66
* Remove include_metrics paramRichard van der Hoff2018-05-101-17/+7
* Move outgoing_responses_counter handling to RequestMetricsRichard van der Hoff2018-05-102-4/+2
* Bump requests_counter in wrapped_request_handlerRichard van der Hoff2018-05-101-4/+11
* Move RequestMetrics handling into SynapseRequest.processing()Richard van der Hoff2018-05-102-24/+64
* Make RequestMetrics take a raw time rather than a clockRichard van der Hoff2018-05-102-6/+6
* Move request_id management into SynapseRequestRichard van der Hoff2018-05-102-15/+25
* Move RequestsMetrics to its own fileRichard van der Hoff2018-05-092-124/+151
* Merge pull request #3182 from Half-Shot/hs/fix-twisted-shutdownRichard van der Hoff2018-05-031-3/+8
|\
| * Don't abortConnection() if the transport connection has already closed.Will Hunt2018-05-031-3/+8
* | add missing param to cancelled_to_request_timed_out_errorRichard van der Hoff2018-05-021-1/+1
* | Merge pull request #3154 from NotAFile/py3-stringioRichard van der Hoff2018-04-301-2/+2
|\ \
| * | replace stringIO importsAdrian Tschira2018-04-281-2/+2
* | | Merge pull request #3155 from NotAFile/py3-bytes-1Richard van der Hoff2018-04-302-2/+2
|\ \ \
| * | | more bytes stringsAdrian Tschira2018-04-292-2/+2
| |/ /
* | | Merge pull request #3108 from NotAFile/py3-six-urlparseRichard van der Hoff2018-04-301-2/+1
|\ \ \ | |/ / |/| |
| * | Use six.moves.urlparseAdrian Tschira2018-04-151-2/+1
* | | Backport deferred.addTimeoutRichard van der Hoff2018-04-273-6/+9
* | | Use deferred.addTimeout instead of time_bound_deferredRichard van der Hoff2018-04-233-29/+48
|/ /
* | Merge pull request #3061 from NotAFile/add-some-byte-stringsRichard van der Hoff2018-04-092-5/+5
|\ \
| * | Add b prefixes to some strings that are bytes in py3Adrian Tschira2018-04-042-5/+5
* | | Merge pull request #3016 from silkeh/improve-service-lookupsRichard van der Hoff2018-04-091-95/+8
|\ \ \
| * | | Remove address resolution of hosts in SRV recordsSilke2018-04-041-95/+8
| |/ /
* | | Revert "Merge pull request #3066 from matrix-org/rav/remove_redundant_metrics"Richard van der Hoff2018-04-091-0/+26
* | | Add response size metricsErik Johnston2018-04-061-0/+7
* | | use PUT instead of POST for federating groups/m.join_policyKrombel2018-04-061-1/+5
* | | Remove redundant metrics which were deprecated in 0.27.0.Richard van der Hoff2018-04-041-26/+0
|/ /
* | Add Cache-Control headers to all JSON APIsErik Johnston2018-03-211-0/+1
* | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2018-03-191-2/+0
|\ \
| * | Replace ujson with simplejsonErik Johnston2018-03-151-3/+2
* | | Replace some ujson with simplejson to make it workErik Johnston2018-03-161-1/+2
* | | Add some docstrings to help figure this outRichard van der Hoff2018-03-091-2/+26
* | | Add a metric which increments when a request is receivedRichard van der Hoff2018-03-091-2/+10
* | | refactor JsonResourceRichard van der Hoff2018-03-091-32/+46
* | | Merge pull request #2858 from matrix-org/rav/purge_updatesRichard van der Hoff2018-02-091-3/+15
|\ \ \
| * | | delete_local_events for purge_historyRichard van der Hoff2018-02-091-3/+15
* | | | Merge pull request #2838 from matrix-org/rav/fix_logging_on_dns_failRichard van der Hoff2018-01-311-2/+1
|\ \ \ \
| * | | | Remove spurious log argumentRichard van der Hoff2018-01-301-2/+1
* | | | | Merge pull request #2817 from matrix-org/rav/http_conn_poolRichard van der Hoff2018-01-311-1/+13
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Increase http conn pool sizeRichard van der Hoff2018-01-291-1/+6
| |/ / /
| * | | Use a connection pool for the SimpleHttpClientRichard van der Hoff2018-01-201-1/+8
* | | | Add federation_domain_whitelist option (#2820)Matthew Hodgson2018-01-221-1/+27
|/ / /
* | | Merge remote-tracking branch 'origin/develop' into rav/track_db_schedulingRichard van der Hoff2018-01-171-9/+9
|\ \ \
| * \ \ Merge pull request #2793 from matrix-org/rav/db_txn_time_in_millisRichard van der Hoff2018-01-172-4/+6
| |\ \ \
| * | | | Fix 'NoneType' object has no attribute 'writeHeaders'Richard van der Hoff2018-01-161-9/+9
* | | | | Track DB scheduling delay per-requestRichard van der Hoff2018-01-162-1/+10
| |/ / / |/| | |
* | | | Track db txn time in millisecsRichard van der Hoff2018-01-162-4/+6
|/ / /
* | | Reorganise request and block metricsRichard van der Hoff2018-01-151-14/+42
* | | Update http request metrics before calling servletRichard van der Hoff2018-01-091-11/+19
|/ /
* | Merge pull request #2711 from matrix-org/rav/fix_dns_errhandlerRichard van der Hoff2017-11-271-2/+4
|\ \
| * | Fix error handling on dns lookupRichard van der Hoff2017-11-241-2/+4
* | | Improve tracebacks on exceptionsRichard van der Hoff2017-11-271-3/+9
|/ /
* | Fix 500 on invalid utf-8 in requestRichard van der Hoff2017-11-101-1/+2
* | Add a hook for custom rest endpointsRichard van der Hoff2017-11-021-0/+55
* | Merge pull request #2586 from matrix-org/rav/frontend_proxy_auth_headerRichard van der Hoff2017-10-271-28/+80
|\ \
| * | Docstring for post_urlencoded_get_jsonRichard van der Hoff2017-10-271-0/+11
| * | SimpleHTTPClient: add support for headersRichard van der Hoff2017-10-261-28/+69
* | | Fix logcontext leaks in httpclientRichard van der Hoff2017-10-261-10/+9
|/ /
* | replace 'except:' with 'except Exception:'Richard van der Hoff2017-10-234-6/+6
* | Merge branch 'develop' into erikj/groups_mergedDavid Baker2017-10-022-27/+114
|\ \
| * | Improve logging of failures in matrixfederationclientRichard van der Hoff2017-09-281-7/+6
| * | Handle SERVFAILs when doing AAAA lookups for federation (#2477)Richard van der Hoff2017-09-281-5/+17
| * | Do an AAAA lookup on SRV record targets (#2462)Richard van der Hoff2017-09-221-20/+96
* | | Add DELETEErik Johnston2017-07-181-0/+46
* | | Add 'args' param to post_jsonErik Johnston2017-07-181-9/+15
* | | Initial group server implementationErik Johnston2017-07-101-1/+3
|/ /
* | allow Authorization header which handling got implemented in #1098Krombel2017-06-161-1/+1
* | Remember how twisted worksKegan Dougal2017-05-051-2/+2
* | Include the clockKegan Dougal2017-05-051-0/+1
* | Rewrite SimpleHttpClient.request to include timeoutsKegan Dougal2017-05-051-13/+19
* | No need for the exception variableDavid Baker2017-05-031-1/+1
* | List caught expection typesDavid Baker2017-05-031-1/+1
* | Remove debuggingDavid Baker2017-04-261-2/+1
* | Merge remote-tracking branch 'origin/develop' into dbkr/http_request_propagat...David Baker2017-04-261-7/+14
|\ \
| * | Fix some lies, and other clarifications, in docstringsRichard van der Hoff2017-04-211-7/+14
* | | Fix get_jsonDavid Baker2017-04-261-5/+4
* | | Use CodeMessageException subclass insteadDavid Baker2017-04-251-44/+20
* | | Need the HTTP status codeDavid Baker2017-04-211-5/+5
* | | Do the same for get_jsonDavid Baker2017-04-211-8/+21
* | | Don't error for 3xx responsesDavid Baker2017-04-211-1/+1
* | | Propagate errors sensibly from proxied IS requestsDavid Baker2017-04-211-0/+30
|/ /
* | try not to drop context after federation requestsRichard van der Hoff2017-03-231-12/+16
* | Ignore backoff history for invites, aliases, and roomdirsRichard van der Hoff2017-03-231-7/+26
* | push federation retry limiter down to matrixfederationclientRichard van der Hoff2017-03-231-101/+127
* | MatrixFederationHttpClient: clean upRichard van der Hoff2017-03-231-17/+24
* | Merge pull request #1994 from matrix-org/dbkr/msisdn_signin_2Erik Johnston2017-03-151-0/+10
|\ \
| * | Support registration / login with phone numberDavid Baker2017-03-131-0/+10
* | | Fix routing loop when fetching remote mediaRichard van der Hoff2017-03-131-3/+12
|/ /
* | Revert "Support registration & login with phone number"Erik Johnston2017-03-131-10/+0
* | Refector out assert_params_in_requestDavid Baker2017-03-081-0/+10
|/
* Merge branch 'release-v0.18.6' into developMark Haines2016-12-292-7/+70
|\
| * Manually abort the underlying TLS connection.Mark Haines2016-12-291-2/+10
| * Respect long_retries param and default to offErik Johnston2016-12-291-2/+2
| * Spelling and commentsErik Johnston2016-12-291-4/+6
| * Clean upErik Johnston2016-12-292-7/+4
| * Wrap connections in an N minute timeout to ensure they get reaped correctlyErik Johnston2016-12-292-5/+61
* | Merge pull request #1696 from kyrias/ipv6Matthew Hodgson2016-12-192-23/+22
|\ \ | |/ |/|
| * Remove spurious newlineJohannes Löthberg2016-12-121-1/+0
| * Fixup for #1689 and #1690Johannes Löthberg2016-12-122-8/+13
| * IPv6 support for endpoint.pyGlyph2016-12-111-4/+4
| * IPv6 support for client.pyGlyph2016-12-111-16/+11
* | Add new API appservice specific public room listErik Johnston2016-12-061-2/+6
|/
* More intelligent Content-Type parsingRichard van der Hoff2016-11-301-18/+30
* Set CORs headers on responses from the media repoMark Haines2016-11-021-5/+18
* Pass since/from parameters over federationErik Johnston2016-09-151-4/+14
* Add a timeout parameter for end2end key queries.Mark Haines2016-09-121-2/+9
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-30 17:07:25 +0000