summaryrefslogtreecommitdiff
path: root/ext
Commit message (Expand)AuthorAgeFilesLines
* Default to UTF-8 when encoding does not appear to be unicode.Charles Oliver Nutter2015-05-051-4/+9
* Merge branch 'master' into jrubyAaron Patterson2015-03-031-7/+0
|\
| * Fix CVE-2014-9130Florian Frank2015-02-171-7/+0
* | setup java platform gemChristian Meier2015-02-261-7/+18
* | Merge remote-tracking branch 'origin/master' into jrubyCharles Oliver Nutter2015-01-0925-49/+12962
|\ \ | |/
| * fixed build error caused by trunk changesfix-type-dataSHIBATA Hiroshi2014-12-022-0/+4
| * merging from ruby trunkAaron Patterson2014-12-015-26/+58
| * backport from libyaml-1.1.6SHIBATA Hiroshi2014-03-273-7/+12
| * backport from ruby trunkSHIBATA Hiroshi2014-02-215-14/+9
| * merge from ruby trunkAaron Patterson2014-02-058-38/+81
| * * ext/psych/yaml/config.h: bump libyaml to 0.1.5Zachary Scott2014-02-051-4/+4
| * * ext/psych/yaml/emitter.c: merge libyaml 0.1.5Aaron Patterson2014-02-047-51/+91
| * fix typo at https://github.com/ruby/ruby/pull/500 and https://github.com/ruby...SHIBATA Hiroshi2014-01-191-1/+1
| * fix typoAkira Matsuda2013-12-111-4/+4
| * * ext/psych/yaml/yaml.h: [DOC] fix typo by @GreenGeorge [Fixes GH-161]Zachary Scott2013-09-201-1/+1
| * merging from ruby trunkAaron Patterson2013-07-051-1/+1
| * * ext/psych/lib/psych.rb: Adding Psych.safe_load for loading a userAaron Patterson2013-05-141-1/+3
| * merge from RubyAaron Patterson2013-05-141-0/+3
| * * ext/psych/yaml/scanner.c: Typos by James Dabbs [Github Fixes #118]Zachary Scott2013-01-131-17/+17
| * merge changes from ruby trunkAaron Patterson2012-12-138-32/+29
| * make some header file adjustments for ruby compileAaron Patterson2012-11-273-1/+15
| * add the license for libyamlAaron Patterson2012-11-271-0/+19
| * fix c file nameAaron Patterson2012-11-171-0/+0
| * only do have_header checks if we are embedding libyamlAaron Patterson2012-11-171-14/+16
| * mkmf has a global for this testAaron Patterson2012-11-171-2/+1
| * fix build on windowsAaron Patterson2012-11-171-5/+5
| * only embed libyaml if the system does not have itAaron Patterson2012-11-1712-1/+17
| * for compiling on mswinMasaya TARUI2012-11-171-0/+5
| * embedding libyamlAaron Patterson2012-11-1622-878/+13594
| * Psych::SyntaxError now inherits from RuntimeErrorEric Hodel2012-10-221-1/+1
| * * ext/psych/emitter.c (initialize): allow a configuration object to beAaron Patterson2012-07-181-4/+25
| * use RbConfig rather than ConfigAaron Patterson2012-07-181-2/+2
| * * ext/psych/parser.c (transcode_string): fix encoding index names.Aaron Patterson2012-05-171-2/+2
* | Update to latest code from JRuby master.Charles Oliver Nutter2015-01-095-254/+345
* | version list should be a listAaron Patterson2012-04-281-1/+1
* | change `parse` arityAaron Patterson2012-04-281-0/+7
* | put psych in the psych packageAaron Patterson2012-04-285-5/+5
* | import the java implementation from JRubyAaron Patterson2012-04-285-0/+850
|/
* * ext/psych/parser.c: fall back to any encoding if the externalAaron Patterson2012-04-061-3/+4
* * ext/psych/parser.c: prevent a memory leak by protecting calls toAaron Patterson2012-02-271-24/+119
* * ext/psych/parser.c: set parser encoding based on the YAML inputAaron Patterson2012-02-231-2/+89
* * ext/psych/parser.c: removed external encoding setter, allow parserAaron Patterson2012-02-091-24/+4
* syncing with ruby trunkAaron Patterson2012-01-171-1/+1
* * ext/psych/parser.c (parse): parse method can take an option fileAaron Patterson2011-12-061-8/+11
* merging from rubyAaron Patterson2011-11-011-1/+0
* adding more information to the syntax error exceptionAaron Patterson2011-10-041-6/+21
* Using context_mark from the parser struct for accuruate line / columnAaron Patterson2011-10-041-2/+2
* release memory associated with yaml_event using yaml_event_delete at bottom o...Mark J. Titorenko2011-06-051-0/+1
* setting correct taint status for stringsAaron Patterson2011-04-211-0/+14
* synching with ruby trunkv1.1.0Aaron Patterson2011-03-301-1/+1