summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into 2.1.02.1.0Lloyd Hilaiel2011-12-195-9/+32
|\ | | | | | | | | | | Conflicts: CMakeLists.txt ChangeLog
| * bump to 2.0.5 after tagging 2.0.4Lloyd Hilaiel2011-12-191-1/+1
| |
| * changes in 2.0.42.0.4Lloyd Hilaiel2011-12-191-1/+5
| |
| * fix bug in f7e95b936f1d53b1f19a93d7cdca0821d7e09f93 - extra comma in ↵Lloyd Hilaiel2011-12-191-2/+2
| | | | | | | | reformatter usage
| * Added error case for yajl_parse_integer "integer" to check theJoey Ekstrom2011-12-191-0/+4
| | | | | | | | | | | | characters are between 0-9, and setting an error case otherwise. Signed-off-by: Lloyd Hilaiel <lloyd@hilaiel.com>
| * Fixed a bug where valid integers were not being flagged as such, makingJoey Ekstrom2011-12-191-2/+1
| | | | | | | | | | | | | | | | calls like YAJL_IS_INTEGER fail, even though parsing succeeded. Consisted of removing checks that would have been necessary, if the custom integer parsing wasn't used. Signed-off-by: Lloyd Hilaiel <lloyd@hilaiel.com>
| * Merge pull request #57 from plaguemorin/masterLloyd Hilaiel2011-12-191-5/+6
| |\ | | | | | | Fixed memory leak
| | * added errno resetting before setting/checking it in yajl_do_parse()7AC2011-08-191-0/+2
| | |
| | * Edited src/yajl_tree.c via GitHubPhilippe Lague-Morin2011-08-191-5/+6
| | |
| * | Merge pull request #49 from ConradIrwin/masterLloyd Hilaiel2011-12-192-0/+5
| |\ \ | | | | | | | | yajl_gen_escape_solidus is unsettable
| | * | Allow testing yajl_gen_escape_solidusConrad Irwin2011-07-171-0/+4
| | | |
| | * | Allow the yajl_gen_escape_solidus option to be set.Conrad Irwin2011-07-171-0/+1
| | |/
| * | Merge pull request #54 from bovine/masterLloyd Hilaiel2011-12-191-0/+3
| |\ \ | | | | | | | | yajl_gen_double does not always emit decimal point
| | * | update yajl_gen_double to enforce that serialized double values always ↵Jeff Lawson2011-07-301-0/+3
| | |/ | | | | | | | | | contain a decimal point, even if no digits follow the point. this prevents some readers from parsing such values as an integer.
| * | Merge pull request #42 from 7AC/masterLloyd Hilaiel2011-12-191-0/+2
| |\ \ | | | | | | | | errno not being reset
| | * | added errno resetting before setting/checking it in yajl_do_parse()7AC2011-06-141-0/+2
| | | |
| * | | bump to version 2.0.4 after tagging 2.0.3Lloyd Hilaiel2011-12-122-1/+4
| | | |
| * | | changelog for 2.0.32.0.3Lloyd Hilaiel2011-12-121-0/+2
| | |/ | |/|
* | | update changelog with @bpowers contributionsLloyd Hilaiel2011-11-281-1/+2
| | |
* | | Merge branch 'encode-speedup' of https://github.com/bpowers/yajl into 2.1.0Lloyd Hilaiel2011-11-281-13/+35
|\ \ \
| * | | encode: don't check specific cases when the current char is largeBobby Powers2011-10-041-9/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most characters don't get escaped. According to the RFC, the only character greater than '/' that gets escaped is '/'. Test for this common case first, and only if the char is a candidate for escaping check for the other escape cases. This cuts an additional 29% off the runtime of yajl_string_encode
| * | | encode: use an on-stack buffer for 2-char escape sequencesBobby Powers2011-10-041-10/+20
| |/ / | | | | | | | | | | | | When profiling my application, this sped up yajl_string_encode by 3.9%.
* | | bump yajl version to 2.1.0 on the 2.1.0 branchLloyd Hilaiel2011-11-281-2/+2
| | |
* | | augment in-tree performance benchmark to assess serialization performance as ↵Lloyd Hilaiel2011-11-285-83/+236
|/ / | | | | | | well as parsing performance. (provides a means to assess issue #59)
* | look for either _WIN32 or WIN32 on windows. closes #44Lloyd Hilaiel2011-06-203-3/+3
|/
* Merge pull request #36 from utahstreetlabs/tree-get-validation-errorLloyd Hilaiel2011-05-251-2/+4
|\ | | | | validate the length of the correct object in yajl_tree_get
| * validate the length of the correct object in yajl_tree_getRob Zuber2011-05-241-2/+4
|/
* Ignore .DS_Store files on OSXMirek Rusin2011-05-091-0/+1
|
* mention integration of jstamp's pkgconfig patchesLloyd Hilaiel2011-04-291-1/+1
|
* Forgot LIB_SUFFIXJohn Stamp2011-04-291-1/+1
|
* Add a pkg-config fileJohn Stamp2011-04-292-0/+13
|
* bump master version to 2.0.3 after tagging 2.0.2, which includes a pair of ↵Lloyd Hilaiel2011-04-292-3/+6
| | | | fixes in yajl_tree.h that at least one other project out there requires
* fix typos in YAJL_IS_INTEGER and YAJL_IS_NUMBER. closes #302.0.2Lloyd Hilaiel2011-04-282-2/+4
|
* #ifdef __cpluplus wrappers for yajl_tree, closes #29Lloyd Hilaiel2011-04-282-0/+12
|
* bump to 2.0.2 after tagging 2.0.1Lloyd Hilaiel2011-04-271-1/+1
|
* Changes in 2.0.12.0.1Lloyd Hilaiel2011-04-271-0/+5
|
* add option for escaping the '/' (solidus) character. closes #28Lloyd Hilaiel2011-04-264-26/+25
|
* crash fix, handle the case where yajl_alloc() is followed by ↵Lloyd Hilaiel2011-04-262-4/+16
| | | | yajl_complete_parse() without a call to yajl_parse() in the middle. closes #27.
* add a comment to code regarding the forward solidus and the fact that ↵Lloyd Hilaiel2011-04-251-0/+5
| | | | escaping it is optional
* remove a br0k3n line of language from docsLloyd Hilaiel2011-04-251-1/+0
|
* bump to 2.0.1 after tagging 2.0.0Lloyd Hilaiel2011-04-251-1/+1
|
* bump to 2.0.02.0.0Lloyd Hilaiel2011-04-251-5/+3
|
* Merge from 1.x branch (ChangeLog for 1.0.12 and notice about yajl 1 vs yajl 2).Lloyd Hilaiel2011-04-252-0/+15
|\ | | | | | | | | Conflicts: ChangeLog
| * include a note in the readme about availability of new YAJL1.xLloyd Hilaiel2011-04-251-0/+5
| |
| * update ChangeLog with changes in 1.0.12Lloyd Hilaiel2011-04-251-1/+11
| |
| * Parse null bytes correctly.Conrad Irwin2011-04-203-0/+8
| | | | | | | | Signed-off-by: Lloyd Hilaiel <lloyd@hilaiel.com>
* | update ChangeLog with summary of 2.0.0Lloyd Hilaiel2011-04-251-10/+33
| |
* | test harness fixes on win32Lloyd Hilaiel2011-04-252-11/+14
| |
* | fix another pair of build warningsLloyd Hilaiel2011-04-252-3/+3
| |
* | compiling cleanly on winblowsLloyd Hilaiel2011-04-256-38/+55
| |