Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Feb 22, 2015
  1. Jakub Zelenka

    Merge branch 'PHP-5.6'

    bukka authored
    The fix for master is a bit different (it's fixed in encoder)
  2. Jakub Zelenka

    Merge branch 'PHP-5.5' into PHP-5.6

    bukka authored
    Conflicts:
    	ext/json/json.c
  3. Jakub Zelenka

    Fix bug #64695 (JSON_NUMERIC_CHECK has issues with strings that are n…

    bukka authored
    …umbers plus the letter e)
Commits on Feb 17, 2015
  1. Jakub Zelenka

    Set PHP_JSON_VERSION to 1.4.0

    bukka authored
Commits on Feb 16, 2015
  1. Jakub Zelenka

    Delete json outdated package.xml

    bukka authored
    The package.xml has not been update for more then 8 years and
    there is no reason to keep it. It would require quite
    a bit of digging in git history to update it which is
    not worth it.
  2. Anatol Belski

    made ZEND_TSRMLS_CACHE_* macros look like function calls

    weltling authored
    which also comply with the current semantics for such macros
Commits on Feb 15, 2015
  1. Jakub Zelenka

    Update JSON Readme

    bukka authored
  2. Jakub Zelenka
  3. Jakub Zelenka

    Add bison 3.0.4 genereted files for json parser

    bukka authored
    The definitions file (json_parser.tab.h) contains file
    system dependent name for C preprocessor guard:
    
    YY_PHP_JSON_YY_HOME_JAKUB_PROG_PHP_MASTER_EXT_JSON_JSON_PARSER_TAB_H_INCLUDED
    
    This is because the srcdir is used for default definitions name.
    It's a correct default (--definition=$(srcdir)/json_parser.tab.h)
    because the build would fail otherwise. Unfortunately Bison does not have
    a special option for defining cpp guard name. The only way would be
    using skeleton file but that's not possible with the current
    configuration as it requires using a specific bison version
    (disallowing range of supported versions).
  4. Jakub Zelenka
Commits on Feb 10, 2015
  1. Anatol Belski
  2. Anatol Belski

    use portable strtol

    weltling authored
Commits on Feb 9, 2015
  1. Michael Wallner

    fix json globals

    m6w6 authored
  2. Anatol Belski

    regenerated scanner

    weltling authored
  3. Anatol Belski

    fix datatype mismatches

    weltling authored
  4. Anatol Belski
  5. Anatol Belski

    size_t vs int

    weltling authored
  6. Anatol Belski

    use size_t for str length

    weltling authored
  7. Anatol Belski
Commits on Feb 8, 2015
  1. Jakub Zelenka

    Merge branch 'master' into jsond

    bukka authored
    Conflicts:
    	ext/json/json.c
Commits on Feb 4, 2015
  1. jpauli

    Merge branch 'PHP-5.5' into PHP-5.6

    jpauli authored
    * PHP-5.5:
      Revert "json_decode() should generate a syntax error when given ""."
      Update NEWS
  2. jpauli
  3. Dmitry Stogov
Commits on Feb 2, 2015
  1. Jakub Zelenka

    Fix invalid test for bug 54484

    bukka authored
  2. Jakub Zelenka

    Add re2c sources

    bukka authored
  3. Jakub Zelenka
  4. Jakub Zelenka

    Give me credit

    bukka authored
  5. Adam Harvey

    Merge branch 'PHP-5.6'

    LawnGnome authored
  6. Adam Harvey
  7. Adam Harvey

    json_decode() should generate a syntax error when given "".

    LawnGnome authored
    Fixes bug #68938 (json_decode() decodes empty string without error).
    Patch by jeremy at bat-country dot us.
Commits on Jan 25, 2015
  1. Jakub Zelenka

    Merge branch 'master' into jsond

    bukka authored
    Conflicts:
    	ext/json/JSON_parser.c
    	ext/json/json.c
Commits on Jan 19, 2015
  1. Stanislav Malyshev

    Merge branch 'PHP-5.6'

    smalyshev authored
    * PHP-5.6:
      Fixed bug #50224 where float without decimals were converted to integer
      Updated NEWS for #68371
  2. Juan Basso Stanislav Malyshev
Commits on Jan 18, 2015
  1. Jakub Zelenka

    Increase PHP_JSON_DOUBLE_MAX_LENGTH for fractional part

    bukka authored
    This is probably not necessary as such number
    is not realistic. It's just to be consistent
    with jsond extension.
Commits on Jan 15, 2015
  1. Xinchen Hui

    bump year

    laruence authored
Something went wrong with that request. Please try again.