archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 06:58:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
81192 commits 526 branches 1434 tags 873 MiB
Commit graph

1240 commits

Author SHA1 Message Date
Dmitry Stogov
b11a30f5ea Merge branch 'master' into phpng 
* master:
  Support for __debugInfo (Joe Watkins)
  Optimize ZEND_POW (Rouven Weßling)
  gcov: tentative fix for broken coverage data after fix for opcache coverage slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir
  gcov: tentative fix for broken coverage data after fix for opcache coverage slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir
  Prevent recursion in ZF2 Parameters class
  adding NEWS block for beta4
  5.4.30 next
  enable email notifications
  update NEWS
  update NEWS
  update NEWS
  - Updated to version 2014.3 (2014c)
  fix bug #67253: timelib_meridian_with_check out-of-bounds read
  Fix bug #67252: convert_uudecode out-of-bounds read
  Fix bug #67251 - date_parse_from_format out-of-bounds read
  Fix bug #67250 (iptcparse out-of-bounds read)

Conflicts:
	ext/opcache/zend_persist.c
	ext/spl/spl_array.c
 2014-05-18 21:17:31 +04:00
Pierre Joye
6a3ee29785 fix build 2014-05-15 09:38:26 +02:00
Stanislav Malyshev
3c107d6434 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix bug #67253: timelib_meridian_with_check out-of-bounds read
  Fix bug #67252: convert_uudecode out-of-bounds read
  Fix bug #67251 - date_parse_from_format out-of-bounds read
  Fix bug #67250 (iptcparse out-of-bounds read)
 2014-05-13 17:04:44 -07:00
Stanislav Malyshev
292b2fd3b3 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix bug #67253: timelib_meridian_with_check out-of-bounds read
  Fix bug #67252: convert_uudecode out-of-bounds read
  Fix bug #67251 - date_parse_from_format out-of-bounds read
  Fix bug #67250 (iptcparse out-of-bounds read)
 2014-05-13 17:03:50 -07:00
Stanislav Malyshev
a03a1ab88c Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix bug #67253: timelib_meridian_with_check out-of-bounds read
  Fix bug #67252: convert_uudecode out-of-bounds read
  Fix bug #67251 - date_parse_from_format out-of-bounds read
  Fix bug #67250 (iptcparse out-of-bounds read)

Conflicts:
	ext/date/lib/parse_date.c
	ext/date/lib/parse_date.re
 2014-05-13 17:02:09 -07:00
Stanislav Malyshev
dc92e81922 Merge branch 'bug67251' into PHP-5.4 
* bug67251:
  Fix bug #67251 - date_parse_from_format out-of-bounds read

Conflicts:
	ext/date/lib/parse_date.c
 2014-05-13 16:52:45 -07:00
Stanislav Malyshev
0094fd0969 Merge branch 'bug67252' into PHP-5.4 
* bug67252:
  fix bug #67253: timelib_meridian_with_check out-of-bounds read
  Fix bug #67252: convert_uudecode out-of-bounds read
 2014-05-13 16:47:27 -07:00
Derick Rethans
7ee66c51e6 Merge branch 'PHP-5.6' 2014-05-13 16:37:07 +01:00
Derick Rethans
db42f83c2e Merge branch 'PHP-5.5' into PHP-5.6 2014-05-13 16:37:05 +01:00
Derick Rethans
e3a48b3a43 Merge branch 'PHP-5.4' into PHP-5.5 2014-05-13 16:36:59 +01:00
Derick Rethans
3e276d6728 - Updated to version 2014.3 (2014c) 2014-05-13 16:36:58 +01:00
Stanislav Malyshev
466b8aa444 fix bug #67253: timelib_meridian_with_check out-of-bounds read 2014-05-11 21:09:11 -07:00
Stanislav Malyshev
0a80849250 Fix bug #67251 - date_parse_from_format out-of-bounds read 2014-05-11 19:34:21 -07:00
Nikita Popov
a9ba7a6779 Add tests for previous commit 2014-05-06 22:04:58 +02:00
Dmitry Stogov
cd4b4dfc4d Merge branch 'master' into refactoring2 
Conflicts:
	Zend/zend_hash.c
	ext/date/php_date.c
 2014-05-05 13:02:43 +04:00
Dmitry Stogov
17d027ed47 Split IS_BOOL into IS_FALSE and IS_TRUE 2014-04-30 18:32:42 +04:00
Nikita Popov
93f9518a58 Align zval_get_long/double with zval_get_string 2014-04-25 23:21:04 +02:00
Dmitry Stogov
f9927a6c97 Merge mainstream 'master' branch into refactoring 
During merge I had to revert:
	Nikita's patch for php_splice() (it probably needs to be applyed again)
	Bob Weinand's patches related to constant expression handling (we need to review them carefully)
	I also reverted all our attempts to support sapi/phpdbg (we didn't test it anyway)

Conflicts:
	Zend/zend.h
	Zend/zend_API.c
	Zend/zend_ast.c
	Zend/zend_compile.c
	Zend/zend_compile.h
	Zend/zend_constants.c
	Zend/zend_exceptions.c
	Zend/zend_execute.c
	Zend/zend_execute.h
	Zend/zend_execute_API.c
	Zend/zend_hash.c
	Zend/zend_highlight.c
	Zend/zend_language_parser.y
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner_defs.h
	Zend/zend_variables.c
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
	ext/date/php_date.c
	ext/dom/documenttype.c
	ext/hash/hash.c
	ext/iconv/iconv.c
	ext/mbstring/tests/zend_multibyte-10.phpt
	ext/mbstring/tests/zend_multibyte-11.phpt
	ext/mbstring/tests/zend_multibyte-12.phpt
	ext/mysql/php_mysql.c
	ext/mysqli/mysqli.c
	ext/mysqlnd/mysqlnd_reverse_api.c
	ext/mysqlnd/php_mysqlnd.c
	ext/opcache/ZendAccelerator.c
	ext/opcache/zend_accelerator_util_funcs.c
	ext/opcache/zend_persist.c
	ext/opcache/zend_persist_calc.c
	ext/pcre/php_pcre.c
	ext/pdo/pdo_dbh.c
	ext/pdo/pdo_stmt.c
	ext/pdo_pgsql/pgsql_driver.c
	ext/pgsql/pgsql.c
	ext/reflection/php_reflection.c
	ext/session/session.c
	ext/spl/spl_array.c
	ext/spl/spl_observer.c
	ext/standard/array.c
	ext/standard/basic_functions.c
	ext/standard/html.c
	ext/standard/mail.c
	ext/standard/php_array.h
	ext/standard/proc_open.c
	ext/standard/streamsfuncs.c
	ext/standard/user_filters.c
	ext/standard/var_unserializer.c
	ext/standard/var_unserializer.re
	main/php_variables.c
	sapi/phpdbg/phpdbg.c
	sapi/phpdbg/phpdbg_bp.c
	sapi/phpdbg/phpdbg_frame.c
	sapi/phpdbg/phpdbg_help.c
	sapi/phpdbg/phpdbg_list.c
	sapi/phpdbg/phpdbg_print.c
	sapi/phpdbg/phpdbg_prompt.c
 2014-04-26 00:32:51 +04:00
Anatol Belski
e5b8fd2cc7 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fixed test
 2014-04-25 17:40:46 +02:00
Anatol Belski
70fdb21d93 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fixed test
 2014-04-25 17:40:33 +02:00
Anatol Belski
1c7f4d2b4b Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fixed test
 2014-04-25 17:40:19 +02:00
Anatol Belski
d3dcd61623 fixed test 2014-04-25 17:39:53 +02:00
Anatol Belski
f5c0cc64ed Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  updated NEWS
  Fixed bug #67118 DateTime constructor crash with invalid data
 2014-04-25 17:27:35 +02:00
Anatol Belski
6448916535 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated NEWS
  Fixed bug #67118 DateTime constructor crash with invalid data
 2014-04-25 17:26:20 +02:00
Anatol Belski
cc9f02751b Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #67118 DateTime constructor crash with invalid data
 2014-04-25 17:24:58 +02:00
Anatol Belski
c1aa9baf29 Fixed bug #67118 DateTime constructor crash with invalid data 2014-04-25 17:23:26 +02:00
Dmitry Stogov
5864ce8a44 Fixed compilation warnings 2014-04-22 17:46:34 +04:00
Dmitry Stogov
e96073b1e4 Moved zend_literal->cache_slot right into zval. 
It should be accessed using Z_CACHE_SLOT() macro.
zend_literal structure is removed.
API functions that accepted pointer to zend_literal now accept pointer to zval or cache_slot directly.
Calls of such functiond that now accept cache_slot need to be changed to pass -1 instead of NULL.
 2014-04-17 15:40:45 +04:00
Dmitry Stogov
a4bda5b187 Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2 2014-04-15 22:44:21 +04:00
Dmitry Stogov
6cf5e51f3e Reduced memory realocations 2014-04-15 22:43:18 +04:00
Nikita Popov
7a1a6092f6 Add functions for extracting long/double/string from zval 
These function get the long / double / string value of a zval with
usual cast semantics, but without actually modifying the zval.

Didn't go on a killing spree for convert_to_* yet...
 2014-04-15 20:32:47 +02:00
Dmitry Stogov
f9b26bc39a Cleanup (2-nd round) 2014-04-15 21:56:30 +04:00
Dmitry Stogov
050d7e38ad Cleanup (1-st round) 2014-04-15 15:40:40 +04:00
Stanislav Malyshev
11bdb85d30 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug #66721
 2014-04-13 15:56:02 -07:00
Stanislav Malyshev
d3c4292db7 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #66721
 2014-04-13 15:55:45 -07:00
Stanislav Malyshev
733b09442d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #66721
 2014-04-13 15:55:07 -07:00
Boro Sitnikovski
8c88b6e81c Fix bug #66721 
Add NULL check to php_date_parse_tzfile's retval
 2014-04-13 15:51:55 -07:00
Nikita Popov
20f2e5986e Fix ZTS build 
This only makes it compile, it doesn't actually work, presumably
because interned strings are assumed in some places.
 2014-04-09 23:41:16 +02:00
Dmitry Stogov
7402af380b Fixed destruction of objects and iterators on unclean request shutdown and GC (few cases are still unfixed). 
Now we destroy objects it two steps. At first - object properties of all objects and only then the objects their selves.
 2014-04-09 01:50:15 +04: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
d8099d0468 Changed data layout to allow more efficient operations 2014-04-02 14:34:44 +04:00
Dmitry Stogov
ea85451b65 Refactored data structures to keep zend_object* instead of a whole zval in some places 2014-03-28 02:11:22 +04:00
Derick Rethans
5fe735c5a2 Merge branch 'PHP-5.6' 2014-03-25 12:17:22 +00:00
Derick Rethans
dcc0644cde Merge branch 'PHP-5.5' into PHP-5.6 2014-03-25 12:17:19 +00:00
Derick Rethans
039cb10fa3 Merge branch 'PHP-5.4' into PHP-5.5 2014-03-25 12:17:15 +00:00
Derick Rethans
170cf3ec00 - Updated to version 2014.2 (2014b) 2014-03-25 12:17:14 +00:00
Dmitry Stogov
7ce06ee5a7 don't keep useless objects till the end of the script (destroy them immediately) 2014-03-21 15:32:02 +04:00
Dmitry Stogov
b7938ab1bd Refactored GC (incomplete) 2014-03-19 17:00:28 +04:00
Derick Rethans
22fc261628 Merge branch 'PHP-5.6' 2014-03-18 15:02:27 +00:00
Derick Rethans
415233d26d Merge branch 'PHP-5.5' into PHP-5.6 2014-03-18 15:02:25 +00:00