clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-26 20:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
94,646 Commits 494 Branches 1,367 Tags 881 MiB
138fea83fe
Commit Graph

105 Commits

Author SHA1 Message Date
Xinchen Hui
97a9470d97 bump year which is missed in rev 49493a2 2016-01-02 17:56:11 +08:00
Xinchen Hui
c7cb40353c Merge branch 'PHP-5.6' into PHP-7.0 
Conflicts:
	Zend/zend_ini_scanner.c
 2015-10-20 13:26:02 +08:00
Xinchen Hui
d5f76caf6c Fixed bug #70748 (Segfault in ini_lex () at Zend/zend_ini_scanner.l) 2015-10-20 13:20:56 +08:00
Dmitry Stogov
e549ebdb23 Mark parse error functions as cold 2015-08-26 18:29:42 +03:00
Anatol Belski
a96345d12b Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  updated NEWS
  fixed bug, where a linebreak immediately after an opening quote of a value caused a segfault
  made failing test more meaningful
  added failing test
 2015-06-10 10:44:44 +02:00
Anatol Belski
ca467d5117 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated NEWS
  fixed bug, where a linebreak immediately after an opening quote of a value caused a segfault
  made failing test more meaningful
  added failing test
 2015-06-10 10:43:23 +02:00
Christoph M. Becker
36222eb4cc fixed bug, where a linebreak immediately after an opening quote of a value caused a segfault 2015-06-10 10:39:37 +02:00
Xinchen Hui
f42d9d6161 Fixed bug #68805 (Double define) 2015-01-17 23:06:37 -05:00
Nikita Popov
83391b5518 Remove for #-style comments in ini files 2015-01-17 18:26:44 +01:00
Xinchen Hui
fc33f52d8c bump year 2015-01-15 23:27:30 +08:00
Xinchen Hui
0579e8278d bump year 2015-01-15 23:26:37 +08:00
Xinchen Hui
73c1be2653 Bump year 2015-01-15 23:26:03 +08:00
Stanislav Malyshev
b7a7b1a624 trailing whitespace removal 2015-01-10 15:07:38 -08:00
Anatol Belski
bdeb220f48 first shot remove TSRMLS_* things 2014-12-13 23:06:14 +01:00
Anatol Belski
d9d16d2e68 fix datatype mismatch warnings 2014-10-29 15:29:59 +01:00
Tjerk Meesters
8064b1f4f7 Fixed 'long' -> 'zend_long' for call to 'is_numeric_string_ex()' 2014-09-01 22:49:12 +08:00
Tjerk Meesters
5d5a7b1f7f Merge branch 'PHP-5.6' 
* PHP-5.6:
  Updated UPGRADING for #38409
  Updated NEWS for #38409
  Added test case
  Making ini parser typed - Added ZEND_INI_SCANNER_TYPED mode for parse_ini_string() and parse_ini_file() - Added NULL_NULL token to separate it from BOOL_FALSE and BOOL_TRUE - Added zend_ini_copy_typed_value() function for zval initialisation - Updated RETURN_TOKEN() to observe scanner_mode

Conflicts:
	Zend/zend_ini_parser.y
	Zend/zend_ini_scanner.c
 2014-09-01 22:43:17 +08:00
Tjerk Meesters
5270ee1aef Making ini parser typed 
- Added ZEND_INI_SCANNER_TYPED mode for parse_ini_string() and parse_ini_file()
- Added NULL_NULL token to separate it from BOOL_FALSE and BOOL_TRUE
- Added zend_ini_copy_typed_value() function for zval initialisation
- Updated RETURN_TOKEN() to observe scanner_mode
 2014-09-01 22:04:06 +08:00
Nikita Popov
d2a3bf9daf Fix compiler warnings 2014-08-25 23:08:01 +02:00
Anatol Belski
c3e3c98ec6 master renames phase 1 2014-08-25 19:24:55 +02:00
Anatol Belski
8ee2a4a9b5 first shot on merging the core fro the int64 branch 2014-08-16 11:16:11 +02:00
Nikita Popov
e0247de147 zend_stack_top() now returns pointer directly 2014-05-01 09:08:30 +02:00
Nikita Popov
5a03efe279 Don't allocate zend_stack elements individually 
Instead allocate a vector of elements. Size must now be specified
on initialization rather than on push.
 2014-05-01 09:08:29 +02:00
Dmitry Stogov
76cc99fe60 Refactored ZVAL flags usage to simplify various checks (e.g. Z_REFCOUNTED(), candidate for GC, etc) 2014-04-03 15:26:23 +04:00
Dmitry Stogov
f4cfaf36e2 Use better data structures (incomplete) 2014-02-10 10:04:30 +04:00
Xinchen Hui
c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Xinchen Hui
47c9027772 Bump year 2014-01-03 11:06:16 +08:00
Dejan Marjanovic
05016b7e96 Added XOR support for expressions in INI parser 2013-03-27 21:28:53 +01:00
Xinchen Hui
a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Pierrick Charron
6dff07aa8c Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value 
Restore the old behavior but keep bug 51094 fixed
 2012-11-16 18:04:14 -05:00
Pierrick Charron
fed5923dbc Fixed bug #51094 (parse_ini_file() with INI_SCANNER_RAW cuts a value that includes a semi-colon) 
Modify the scanner to check if the first char of the raw data is an opening " in which case we
need to find the closing one. Otherwise just search for the next end of value char [\r\n;\000]
 2012-06-07 17:44:20 +02:00
Xinchen Hui
c870ebe138 Fixed bug #61087 (Memory leak in parse_ini_file when specifying invalid scanner mode) 2012-02-25 14:15:11 +00:00
Felipe Pena
e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
927bf09c29 - Year++ 2011-01-01 02:19:59 +00:00
Felipe Pena
3ef14fc609 - Fixed bug #52508 (newline problem with parse_ini_file+INI_SCANNER_RAW) 2010-08-01 15:26:54 +00:00
Felipe Pena
00191c3c34 - Fixed bug #51899 (Parse error in parse_ini_file() function when empy value followed by no newline) 2010-05-26 02:18:17 +00:00
Jani Taskinen
7a303b3328 - Fixed bug #50952 (allow underscore _ in constants parsed in php.ini files) 2010-02-07 11:40:29 +00:00
Sebastian Bergmann
3defe76254 sed -i "s#1998-2009#1998-2010#g" **/*.re **/*.y **/*.l 2010-01-05 20:40:23 +00:00
Jani Taskinen
19d320ea05 - Fixed bug #50340 (php.ini parser does not allow spaces in ini keys) 2009-11-30 22:38:32 +00:00
Jani Taskinen
6e18b9718d - Fixed bug #48719 parse_ini_*(): scanner mode is not checked for sanity) 2009-08-07 15:44:37 +00:00
Jani Taskinen
46505193b2 - Fixed bug #48660 (parse_ini_*(): dollar sign as last character of value fails) 2009-08-07 14:21:38 +00:00
Jani Taskinen
d03720480f - Fixed bug #48768 (parse_ini_*() crash with INI_SCANNER_RAW) 2009-08-04 02:56:26 +00:00
Jani Taskinen
ea98d7a72e - Fixed bug #49056 (parse_ini_file() regression in 5.3.0 when using non-ASCII strings as option keys) 2009-08-04 02:34:04 +00:00
Brian Shire
c80f0bf769 MFH: Fix bug #47859 parse_ini_file() does not like asterisk (*) in key in the beginning, and allow [*_-] chars at start of ini labels 2009-05-19 15:59:36 +00:00
Nuno Lopes
7f6ff02f5c fix bug #46347: allow * in ini keys 2009-02-02 19:23:13 +00:00
Felipe Pena
bfcea7ffa8 - MFH: Year++ 2009-01-02 20:45:43 +00:00
Scott MacVicar
db73c5ec74 MFH Fix bug #45991 - UTF-8 BOM breaks ini parser 2008-12-24 13:49:31 +00:00
Arnaud Le Blanc
2276e85f13 MFH: Added parse_ini_string() function (grange at lemonde dot fr, Arnaud) 
[DOC] new function parse_ini_string()
      proto array parse_ini_string(string ini_string
          [, bool process_sections [, int scanner_mode]])
      Same as parse_ini_file() except that it takes a string instead of a
      filename.
 2008-11-05 21:35:02 +00:00
Arnaud Le Blanc
b3d0514b6f Fixed bug #44575 (parse_ini_file comment # line problems) 
[DOC] parse_ini_file(): comments starting with # are deprecated in PHP 5.3
      (comments starting with ; should be used instead)
 2008-11-02 23:36:10 +00:00
Stanislav Malyshev
193dd31a22 Fix BC issue with ini scanner. 
# Now in "": \LETTER is literal, \" is escaped ", value ending with \" is literal
 2008-09-11 00:33:38 +00:00