aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2017-04-19test_dump: Don't use pipe on MinGWmingwPetri Lehtinen1-1/+1
2017-04-19appveyor: Build with MinGW and Visual Studio 2017Petri Lehtinen1-9/+16
2017-04-13Merge commit '1b8bebf0bf8f1c0c3d92faf67a830bf8448897ed'2.10Petri Lehtinen1-1/+1
2017-04-13Allow forward declaring json_error_t valuesPetri Lehtinen1-1/+1
2017-04-12build: Use Autoconf macro @includedir@ for jansson.pc.Mathieu Lirzin1-1/+1
This is more consistent with what is done for other pkg-config variables.
2017-03-29Merge pull request #336 from akheron/issue-333Petri Lehtinen1-1/+1
CMakeLists.txt: Remove extra parenthesis
2017-03-29CMakeLists.txt: Remove extra parenthesisPetri Lehtinen1-1/+1
Fixes #333
2017-03-02jansson 2.10v2.10Nathaniel McCallum6-7/+32
2017-03-02Merge pull request #329 from npmccallum/embedPetri Lehtinen4-6/+52
Add JSON_EMBED encoding flag
2017-02-27Add JSON_EMBED encoding flagNathaniel McCallum4-6/+52
The JSON_EMBED encoding flag causes the opening and closing characters of the top-level array ('[', ']') or object ('{', '}') to be omitted during encoding. This feature makes it possible to concatenate multiple arrays or objects in the stream output. It also makes it possible to perform outputs of partial composes. One such example of a partial compose is when outputting a JWE object. The output is a JSON object. But it has one top-level attribute ("ciphertext") that can grow out of proportion with the rest of the metadata. With the JSON_EMBED flag, the other metadata can be composed ahead of time and dumped during the beginning of output, where the "ciphertext" and "tag" attributes can be streamed out in chunks. Thus, the header material can be composed with Jansson and the ciphertext itself can be composed manually.
2017-01-31Merge pull request #328 from npmccallum/masterPetri Lehtinen8-7/+243
Helper functions for network IO
2017-01-27Implement json_dumpfd() and json_loadfd()Nathaniel McCallum8-7/+166
The primary use of these functions is easy loading and dumping from stream sockets. Signed-off-by: Nathaniel McCallum <npmccallum@redhat.com>
2017-01-26Implement json_dumpb()Nathaniel McCallum5-0/+77
This function encodes the json_t object to a pre-allocated buffer. It compliments the already existing json_loadb() function and is useful for parsing JSON-RPC (among other protocols) when sent over datagram sockets. Signed-off-by: Nathaniel McCallum <npmccallum@redhat.com>
2016-11-16Merge pull request #321 from quiet/masterPetri Lehtinen1-1/+1
parens for LONG_LONG_INT in cmake
2016-11-12parens for LONG_LONG_INT in cmakeBrian Armstrong1-1/+1
when this is defined as "", cmake bails with an error about arguments in if
2016-10-24Merge pull request #314 from martinlindhe/condition-always-truePetri Lehtinen1-2/+2
part of conditional expression is always true (!done)
2016-10-24Merge pull request #311 from robertmu/masterPetri Lehtinen1-1/+1
Fix passing redundant argument to error_set()
2016-10-24Merge pull request #309 from halfaleague/larger-json-buffersPetri Lehtinen1-1/+1
Allow parsing of buffers larger than 2GB on most 64 bit arch.
2016-10-19part of conditional expression is always true (!done), found with pvs-studioMartin Lindhe1-2/+2
2016-10-07Fix passing redundant argument to error_set()Robert Mu1-1/+1
2016-10-01Allow parsing of buffers larger than 2GB on most 64 bit arch.Luke Carmichael1-1/+1
size_t is usually 64 bits on most architectures -- this allows for larger .json files
2016-09-18doc: Change version to 2.10-devPetri Lehtinen1-1/+1
2016-09-18doc: Change version to 2.92.9Petri Lehtinen1-1/+1
2016-09-18jansson 2.9v2.9Petri Lehtinen6-6/+30
2016-09-18Update copyrights for 2016Petri Lehtinen41-41/+41
2016-09-16Merge branch '2.8'Petri Lehtinen1-1/+2
2016-09-16Add install targets to be optional2.8Matthew Johnston1-0/+3
2016-09-16Added test files to .gitignoreYuriy Romanenko1-0/+4
2016-09-16Don't include jansson_config.h in dist tarballsPetri Lehtinen1-1/+2
Fixes #306
2016-09-12Merge pull request #305 from warmwaffles/masterPetri Lehtinen1-0/+3
Allow install targets to be optionally defined
2016-09-11Add install targets to be optionalMatthew Johnston1-0/+3
2016-09-08Merge pull request #303 from groman2/yr-devPetri Lehtinen1-0/+4
Added test files to .gitignore
2016-09-07Added test files to .gitignoreYuriy Romanenko1-0/+4
2016-09-01Merge branch '2.8'Petri Lehtinen1-2/+2
2016-09-01Fix another typoPetri Lehtinen1-1/+1
2016-09-01Merge pull request #302 from yujunz/patch-1Petri Lehtinen1-1/+1
Fix typo
2016-09-01Fix typoYujun Zhang1-1/+1
2016-08-31Merge pull request #301 from npmccallum/masterPetri Lehtinen3-0/+44
Add support for the cleanup attribute in GCC/Clang
2016-08-31Add support for the cleanup attribute in GCC/ClangNathaniel McCallum3-0/+44
The new json_auto_t macro allows easy declaration of json_t types that automatically decrement at the end of their scope.
2016-08-31doc: Fix json_error_t::position typePetri Lehtinen1-1/+1
Fixes #300
2016-08-31doc: Fix json_error_t::position typePetri Lehtinen1-1/+1
Fixes #300
2016-08-30Set documentation version to 2.9-devPetri Lehtinen1-1/+1
2016-08-30Set documentation version to 2.8Petri Lehtinen1-1/+1
2016-08-30jansson 2.8v2.8Petri Lehtinen10-26/+14
2016-08-26jansson 2.8Petri Lehtinen1-4/+25
2016-08-25Merge pull request #293 from akheron/object-insertion-orderPetri Lehtinen9-111/+68
Always preserve insertion order of object items
2016-08-11Merge pull request #298 from pasiopou/oom-crashPetri Lehtinen2-8/+54
OOM crash
2016-08-11Conform to c89Andreas Pasiopoulos2-3/+5
2016-08-11Check the allocation was successful before freeing existing hashtable bucketsAndreas Pasiopoulos1-7/+9
and increasing hashtable order Fixes a crash observed when there is OOM in hashtable_do_rehash
2016-08-11Add a test case for OOM while allocating memoryAndreas Pasiopoulos1-1/+43
generated by cgit v1.1 at 2024-07-10 04:07:26 +0000