summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Ensure java 1.8 bytecode is targetedHEADv1.3.5-6masterJakob Odersky2019-10-091-0/+1
|
* Build ScalaJS version for 2.13Jakob Odersky2019-10-093-5/+5
|
* update readmeJakob Odersky2019-08-011-1/+3
|
* Fork: rename organizationv1.3.5-5Jakob Odersky2019-06-107-18/+80
|
* Add support for ScalaJS and Scala NativeJakob Odersky2019-06-1040-159/+336
| | | | Binary compatibility with previous versions is maintained.
* Update scala 2.13.0-RC2 to 2.13.0-RC3 (#298)Philippus Baalman2019-05-312-2/+2
|
* Update to 2.13.0-RC2 (#296)Arnout Engelen2019-05-222-2/+2
|
* Update scala 2.13.0-M5 to 2.13.0-RC1 (#294)Philippus Baalman2019-04-158-17/+17
| | | | | | | | | | | | | | | | | | * Update specs2 to 4.5.1 * Update scala 2.13.0-M5 to 2.13.0-RC1 * Replace deprecated unicode arrows * Replace deprecated symbol literals * Update scala 2.12.7 to 2.12.8 * Update sbt to 1.2.8 * Update sbt-osgi to 0.9.5 * Update dependencies for scala 2.10.x
* Add note about changed field order to CHANGELOGJohannes Rudolph2018-11-091-0/+3
|
* Bump version in README to 1.3.5Johannes Rudolph2018-11-081-1/+1
|
* Next versionJohannes Rudolph2018-11-081-1/+1
|
* Add 1.3.5 release notesv1.3.5Johannes Rudolph2018-11-081-0/+29
|
* Add documentation for JsonParserSettingsJohannes Rudolph2018-11-081-1/+15
|
* Seal JsonParserSetting traitJohannes Rudolph2018-11-081-1/+17
| | | | It shouldn't be extended but be used as shown.
* Bump version to 1.3.5Johannes Rudolph2018-11-081-1/+1
|
* Merge pull request #283 from jrudolph/limit-size-of-numbersJohannes Rudolph2018-11-083-5/+35
|\ | | | | CVE-2018-18853 Limit the number of characters for numbers in the parser, fixes #278
| * CVE-2018-18853 Limit the number of characters for numbers in the parser, ↵Johannes Rudolph2018-11-073-5/+35
|/ | | | | | | | | fixes #278 BigInteger/BigDecimal seems to have approx. quadratic runtime for instantiating big numbers from Strings. Lacking a better solution we introduce a character limit for numbers. According to the benchmarks from #278, at 100 digits the constant/linear parts still predominate over the quadratic slowdowns seen with 10000+ digits.
* Merge pull request #284 from jrudolph/fix-uncontrolled-recursionJohannes Rudolph2018-11-073-19/+68
|\ | | | | CVE-2018-18855 Fix uncontrolled recursion in JsonParser
| * CVE-2018-18855 Fix uncontrolled recursion in the JsonParser by imposing a ↵Johannes Rudolph2018-11-073-19/+68
| | | | | | | | configurable limit on the depth, fixes #286
* | Merge pull request #285 from spray/jrudolph-patch-1Johannes Rudolph2018-11-071-2/+15
|\ \ | | | | | | Travis: add workspace caching (ivy/sbt)
| * | Travis: add workspace caching (ivy/sbt)Johannes Rudolph2018-11-071-2/+15
| | |
* | | Merge pull request #280 from jrudolph/use-TreeMap-fixes-277Johannes Rudolph2018-11-075-13/+76
|\ \ \ | |/ / |/| | CVE-2018-18854 Use TreeMap instead of HashMap for JsObject key/value pairs, fixes #277
| * | CVE-2018-18854 Use TreeMap instead of HashMap for JsObject key/value pairs, ↵Johannes Rudolph2018-11-075-13/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #277 The problem is that with String's hashCode implementation it is too simple to create synthetic collisions. This allows an attacker to create an object with keys that all collide which leads to a performance drop for the HashMap just for creating the map in the first place. See https://github.com/scala/bug/issues/11203 for more information about the underlying HashMap issue. For the time being, it seems safer to use a TreeMap which uses String ordering. Benchmarks suggest that using a TreeMap is only ~6% slower for reasonably sized JSON objects up to 100 keys. Benchmark for non-colliding keys: Benchmark (_size) (parser) Mode Cnt Score Error Units ExtractFieldsBenchmark.readSpray 1 HashMap thrpt 5 1195832.262 ± 64366.605 ops/s ExtractFieldsBenchmark.readSpray 1 TreeMap thrpt 5 1342009.641 ± 17307.555 ops/s ExtractFieldsBenchmark.readSpray 10 HashMap thrpt 5 237173.327 ± 70341.742 ops/s ExtractFieldsBenchmark.readSpray 10 TreeMap thrpt 5 233510.618 ± 69638.750 ops/s ExtractFieldsBenchmark.readSpray 100 HashMap thrpt 5 23202.016 ± 1514.763 ops/s ExtractFieldsBenchmark.readSpray 100 TreeMap thrpt 5 21899.072 ± 823.225 ops/s ExtractFieldsBenchmark.readSpray 1000 HashMap thrpt 5 2073.754 ± 66.093 ops/s ExtractFieldsBenchmark.readSpray 1000 TreeMap thrpt 5 1793.329 ± 43.603 ops/s ExtractFieldsBenchmark.readSpray 10000 HashMap thrpt 5 208.160 ± 7.466 ops/s ExtractFieldsBenchmark.readSpray 10000 TreeMap thrpt 5 160.349 ± 5.809 ops/s
* | | Merge pull request #282 from jrudolph/introduce-JsonParserSettingsJohannes Rudolph2018-11-073-2/+16
|\ \ \ | | |/ | |/| Introduce JsonParserSettings to allow customization of parsing
| * | Introduce JsonParserSettings to allow customization of parsingJohannes Rudolph2018-10-303-2/+16
|/ /
* | Merge pull request #274 from xuwei-k/jdk11Johannes Rudolph2018-10-231-0/+4
|\ \ | | | | | | add jdk11 test
| * | add jdk11 testxuwei-k2018-10-231-0/+4
| |/
* | sbt 1.2.6 (#276)kenji yoshida2018-10-231-1/+1
| |
* | Merge pull request #279 from jrudolph/update-to-scala-2.12.7Johannes Rudolph2018-10-232-2/+2
|\ \ | |/ |/| Update to Scala 2.12.7
| * Update to Scala 2.12.7Johannes Rudolph2018-10-232-2/+2
|/
* Merge pull request #275 from xuwei-k/Scala-2.13.0-M5v1.3.4-2.13.0-M5Johannes Rudolph2018-10-232-4/+4
|\ | | | | Scala 2.13.0-M5
| * Scala 2.13.0-M5xuwei-k2018-10-142-4/+4
|/
* Add support for Scala 2.13.0-M4 (#263)v1.3.4-2.13.0-M4kenji yoshida2018-08-079-17/+26
|
* Merge pull request #269 from jrudolph/update-dependenciesJohannes Rudolph2018-08-074-27/+8
|\ | | | | Update dependencies
| * Remove 2.13.0-M3 support for nowJohannes Rudolph2018-08-072-10/+1
| | | | | | | | Isn't current any more and support for 2.13.0-M4 will be added later.
| * Cleanup buildJohannes Rudolph2018-08-071-8/+0
| |
| * Build with 2.12 by defaultJohannes Rudolph2018-08-071-3/+1
| |
| * Upgrade dependency versionsJohannes Rudolph2018-08-073-7/+7
|/ | | | | | | | sbt 1.2.0 Scala 2.12.6 specs2 4.3.2 scalacheck 1.14.0 sbt plugin updates
* Merge pull request #272 from nikhilpatil/patch-1Johannes Rudolph2018-08-021-4/+4
|\ | | | | Update README.markdown
| * Update README.markdownNikhil2018-08-011-4/+4
|/ | | - Add numbers to bullet points so that the paragraph just below it can correctly refer to it
* Merge pull request #219 from magnolia-k/fix_warnings_about_manifestJohannes Rudolph2018-07-263-6/+11
|\ | | | | Replace ClassManifest with ClassTag
| * Use classTag[T] instead of implicitly[ClassTag[T]]Johannes Rudolph2018-07-261-3/+2
| |
| * Replace ClassManifest to ClassTagMagnolia K2017-01-223-6/+12
| | | | | | | | | | ClassManifest has been deprecated as of 2.10 and replaced with ClassTag because a warning message is displayed at compile time.
* | Merge pull request #266 from jrudolph/check-mima-against-more-than-one-versionKonrad `ktoso` Malawski2018-07-132-2/+5
|\ \ | | | | | | Check mima against more than one version
| * | Update to sbt 1.1.6Johannes Rudolph2018-07-131-1/+1
| | |
| * | Check mima against a few released versionsJohannes Rudolph2018-07-131-1/+4
|/ /
* | Merge pull request #258 from xuwei-k/Scala-2.12.6Johannes Rudolph2018-07-102-2/+2
|\ \ | | | | | | Scala 2.12.6
| * | Scala 2.12.6xuwei-k2018-05-102-2/+2
| | |
* | | Merge pull request #262 from xuwei-k/patch-1Johannes Rudolph2018-07-101-1/+0
|\ \ \ | | | | | | | | remove unused import
| * | | remove unused importkenji yoshida2018-06-201-1/+0
| | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-02 06:42:08 +0000