tk/Ocelot
1
0
Fork 0
mirror of https://github.com/nsnail/Ocelot.git synced 2025-11-04 19:50:49 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,133 Commits 1 Branch 0 Tags
9ea4645ca99fd257eb5337b818b9514e092712a7
Commit Graph

1133 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TomPallister
9ea4645ca9 Merge branch 'feature/#1088' of https://github.com/ussamoo/Ocelot into ussamoo-feature/#1088 2020-02-04 20:09:20 +00:00
WebMed
73e56322e0 Removed direct reference to Ocelot.Administration project 2020-02-04 20:50:13 +01:00
TomPallister
0babcaea08 Merge branch 'feature/#1088' of https://github.com/ussamoo/Ocelot into ussamoo-feature/#1088 2020-02-04 18:25:32 +00:00
eitamal
b5dc618780 Fix URL for the Ocelot logo in README.md (#1117) 2020-02-04 18:22:33 +00:00
EL Aisati Ahmed
f4eb93b66c Fix issue #1088 (Ocelot Administration doesn't work with .NET Core 3.x) 2020-02-04 18:20:33 +01:00
EL Aisati Ahmed
157737ef01 Revert "Merge branch 'feature/issue#1088'" 
This reverts commit 914a386b0e.
 2020-02-04 18:12:00 +01:00
EL Aisati Ahmed
914a386b0e Merge branch 'feature/issue#1088' 2020-02-04 18:11:38 +01:00
EL Aisati Ahmed
e45071fa10 Fix issue #1088 (Ocelot Administration doesn't work with .NET Core 3.x) 
Fixed OcelotMiddlewareConfigurationDelegate configuration
 2020-02-04 17:59:39 +01:00
Tom Pallister
ebe662abe6 make rate limiting whitelist a function so users can override with dynamic behaviour 
* Make rate-limiting client whitelist dynamic
* Refactor `RateLimitOptions.ClientWhiteList`
* Fix typo in variable `enbleRateLimiting`
* Fix case in variable `clientIdheader`
author Taiwo Otubamowo <totubamowo@deloitte.co.uk>

* fix 1045

* #492 log 500 with error log level, acceptance test, unit test

* #492 minor changes

* initial commit for new feature #1077

allow to limit the number of concurrent tcp connection to a downstream service

* protect code against value not in accurate range

add unit test

* Do not crash host on Dispose

* Add test

* Pin GitVersion.CommandLine package version

* #683 validate if there are duplicated placeholders in UpstreamPathTemplate

* Use registered scheme from Eureka (#1087)

* extra test

* very brief mention MaxConnectionsPerServer in docs

* build develop like a PR

* more docs

* test

Co-authored-by: Taiwo O. <44668623+totubamowo@users.noreply.github.com>
Co-authored-by: Catcher Wong <catcher_hwq@outlook.com>
Co-authored-by: jlukawska <56401969+jlukawska@users.noreply.github.com>
Co-authored-by: buretjph <58700930+buretjph@users.noreply.github.com>
Co-authored-by: Jonathan Mezach <jonathanmezach@gmail.com>
Co-authored-by: 彭伟 <pengweiqhca@sina.com>
 2020-01-19 17:47:57 +00:00
TomPallister
e3a14142b7 Merge branch 'totubamowo-feature/dynamic-rate-limit-client-whitelist' into develop 2020-01-19 17:34:02 +00:00
TomPallister
02c9711369 Merge branch 'feature/dynamic-rate-limit-client-whitelist' of https://github.com/totubamowo/Ocelot into totubamowo-feature/dynamic-rate-limit-client-whitelist 2020-01-19 17:33:50 +00:00
TomPallister
81c81b5a48 Merge branch 'catcherwong-fix-1045' into develop 2020-01-19 17:20:53 +00:00
TomPallister
1723076874 test 2020-01-19 17:20:36 +00:00
TomPallister
e82e303afc Merge branch 'fix-1045' of https://github.com/catcherwong/Ocelot into catcherwong-fix-1045 2020-01-19 17:15:52 +00:00
TomPallister
bec004cf8f Merge branch 'jlukawska-feature/492-log-500-status-code-as-error' into develop 2020-01-19 16:27:21 +00:00
TomPallister
9da55ea037 small changes to log all responses either information or warning 2020-01-19 16:27:08 +00:00
TomPallister
439165bb8f Merge branch 'master' into develop 2020-01-19 15:56:54 +00:00
Tom Pallister
07df311094 harden acceptance tests (#1105) 
* dont use duplicate port

* change port as this often breaks for some reason
 2020-01-19 15:50:11 +00:00
Tom Pallister
5fed449181 slack link in readme (#1104) 2020-01-19 15:35:21 +00:00
Tom Pallister
65710f4a94 +semver: breaking PRs merged from Develop, Eureka honour scheme, don't crash on dispose and validate duplicate placeholders in UpstreamPathTemplate 
* initial commit for new feature #1077

allow to limit the number of concurrent tcp connection to a downstream service

* protect code against value not in accurate range

add unit test

* Do not crash host on Dispose

* Add test

* Pin GitVersion.CommandLine package version

* #683 validate if there are duplicated placeholders in UpstreamPathTemplate

* Use registered scheme from Eureka (#1087)

* extra test

* very brief mention MaxConnectionsPerServer in docs

* build develop like a PR

* more docs

Co-authored-by: jlukawska <56401969+jlukawska@users.noreply.github.com>
Co-authored-by: buretjph <58700930+buretjph@users.noreply.github.com>
Co-authored-by: Jonathan Mezach <jonathanmezach@gmail.com>
Co-authored-by: 彭伟 <pengweiqhca@sina.com>
 2020-01-19 15:00:21 +00:00
TomPallister
836923d268 more docs 2020-01-19 11:19:03 +00:00
TomPallister
4a18e46814 build develop like a PR 2020-01-19 11:15:50 +00:00
TomPallister
49d1748105 very brief mention MaxConnectionsPerServer in docs 2020-01-19 11:14:42 +00:00
TomPallister
bb14855f83 Merge branch 'buretjph-feature/httphandler-maxconnectionperserver' into develop 2020-01-19 11:10:34 +00:00
TomPallister
e4f5a71939 extra test 2020-01-19 11:10:21 +00:00
TomPallister
19881d51ff Merge branch 'feature/httphandler-maxconnectionperserver' of https://github.com/buretjph/Ocelot into buretjph-feature/httphandler-maxconnectionperserver 2020-01-19 10:58:31 +00:00
TomPallister
63b32077b0 Merge branch 'jlukawska-feature/683-validate-two-same-placeholders-in-upstream-template' into develop 2020-01-19 10:53:13 +00:00
TomPallister
48f871088c Merge branch 'feature/683-validate-two-same-placeholders-in-upstream-template' of https://github.com/jlukawska/Ocelot into jlukawska-feature/683-validate-two-same-placeholders-in-upstream-template 2020-01-19 10:50:55 +00:00
TomPallister
a2a5ec635a Merge branch 'jmezach-bugfix/fcp-dispose' into develop 2020-01-19 10:48:26 +00:00
TomPallister
96707a5055 Merge branch 'bugfix/fcp-dispose' of https://github.com/jmezach/Ocelot into jmezach-bugfix/fcp-dispose 2020-01-19 10:46:11 +00:00
彭伟
b28ced4ec5 Use registered scheme from Eureka (#1087) 2020-01-19 10:42:11 +00:00
Tom Pallister
664c6ef626 Updated to netcoreapp3.1 
* added basic sample

* updated docs
 2020-01-18 22:17:22 +00:00
Tom Pallister
0dcb942f23 badge tracks master (#1101) 2020-01-18 14:52:38 +00:00
Tom Pallister
8d6dd887e3 change github and coveralls url to threemammals (#1100) 2020-01-18 14:28:43 +00:00
Tom Pallister
2dcaf27857 code coverage working on windows and linux 2020-01-17 22:09:32 +00:00
TomPallister
9cb00ef159 update cakebuild script for windows and made windows build work 2020-01-17 07:34:57 +00:00
TomPallister
92ce87c61c docker build works on windows 2020-01-16 21:37:51 -08:00
TomPallister
0e6f44b342 updated to remove develop 2020-01-16 22:15:16 +00:00
TomPallister
47efd86661 update readme with circle badge 2020-01-16 21:57:37 +00:00
TomPallister
a8a31cdb8a refactor more build stuff for docker 2020-01-16 21:46:54 +00:00
TomPallister
37ceea019c need to push packages to github here 2020-01-14 10:41:24 +00:00
TomPallister
826fae3f27 removing stuff we dont need from build process 2020-01-14 09:50:10 +00:00
TomPallister
ec7f0de562 use make instead of lots of files 2020-01-13 22:43:16 +00:00
TomPallister
fe60a97d27 moved a few things around 2020-01-13 22:33:07 +00:00
TomPallister
7377f305c2 testing circleci 2020-01-13 22:21:25 +00:00
TomPallister
925422f7ad testing circleci 2020-01-13 22:20:07 +00:00
Tom Pallister
fab09ab4dc updated acceptance and integration tests to use unique ports (#1091) 
* updated acceptance and integration tests to use unique ports

* fix broken travis builds

* fix change port
 2020-01-13 20:43:21 +00:00
jlukawska
caf5cf80fa #683 validate if there are duplicated placeholders in UpstreamPathTemplate 2019-12-16 21:19:31 +01:00
Jonathan Mezach
ef52ea3fc4 Pin GitVersion.CommandLine package version 2019-12-12 08:48:13 +01:00
Jonathan Mezach
ac7d0d0af3 Add test 2019-12-12 08:35:22 +01:00