php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-21 15:08:16 +02:00
Code Issues Packages Projects Releases Wiki Activity
94,922 Commits 547 Branches 1,483 Tags
a9a26100b4d77a0a556dd50e44b265bfdec5bdde
Commit Graph

94922 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitry Stogov a9a26100b4 unpack() function accepts an additional optional argument $offset. 2016-03-03 13:49:45 +03:00
Anatol Belski de3e033010 Merge branch 'PHP-7.0' 
* PHP-7.0:
  show correct MINFO with libpq >= 9.5.x
 2016-03-02 17:06:03 +01:00
Anatol Belski 4f0042bead Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  show correct MINFO with libpq >= 9.5.x
 2016-03-02 17:05:05 +01:00
Anatol Belski 2399c64eaf show correct MINFO with libpq >= 9.5.x 2016-03-02 17:03:20 +01:00
Dmitry Stogov c67c166f93 Removed zend_fcall_info.symbol_table 2016-03-02 17:50:55 +03:00
Dmitry Stogov 960b3755b3 Merge branch 'PHP-7.0' 
* PHP-7.0:
  PHP-7 zend_call_function() doesn't support symbol_table substitution
 2016-03-02 16:57:08 +03:00
Dmitry Stogov 908b662f7f PHP-7 zend_call_function() doesn't support symbol_table substitution 2016-03-02 16:56:39 +03:00
Dmitry Stogov 701edb8c82 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Better fix for IS_INDIRECT support in zend_hash_merge()
 2016-03-02 15:09:50 +03:00
Dmitry Stogov b6bbe33f05 Better fix for IS_INDIRECT support in zend_hash_merge() 2016-03-02 15:09:04 +03:00
Dmitry Stogov 95eda16fe9 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed test (sizeof(zend_string) is different on 32 and 64-bit systems)
 2016-03-02 13:03:22 +03:00
Dmitry Stogov afedd4fd59 Fixed test (sizeof(zend_string) is different on 32 and 64-bit systems) 2016-03-02 13:01:42 +03:00
Dmitry Stogov e66ac376cf Merge branch 'PHP-7.0' 
* PHP-7.0:
  Introduce zend_symtable_exists_ind() for API consistency
 2016-03-02 11:54:44 +03:00
Dmitry Stogov ab800642df Introduce zend_symtable_exists_ind() for API consistency 2016-03-02 11:53:47 +03:00
Stanislav Malyshev f2656af7df Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix wddx merge
 2016-03-02 00:03:09 -08:00
Stanislav Malyshev 1ce0ea7396 fix wddx merge 2016-03-02 00:02:33 -08:00
Stanislav Malyshev 2e874114a2 Merge branch 'PHP-7.0' 
* PHP-7.0: (25 commits)
  Update NEWS
  update NEWS
  fix test file
  Fix version
  update NEWS
  Update NEWS
  Fix bug #71610: Type Confusion Vulnerability - SOAP / make_http_soap_request()
  Fix bug #71637: Multiple Heap Overflow due to integer overflows
  extend check for add_flag
  Fixed another segfault with file_cache_only now
  set version
  fix nmake clean in phpize mode
  Fixed segfault with file_cache_only
  Fixed possible crash at PCRE on MSHUTDOWN
  Fixed more synchronisation issues during SHM reload
  Set proper type flags (REFCOUNTED and COPYABLE) according to interned or regular string
  sync with improvements in NEWS
  Fixed process synchronisation problem, that may cause crashes after opcache restart
  Fix bug #71610: Type Confusion Vulnerability - SOAP / make_http_soap_request()
  Fix bug #71637: Multiple Heap Overflow due to integer overflows
  ...
 2016-03-01 23:11:42 -08:00
Stanislav Malyshev 6823ee923d Update NEWS 2016-03-01 23:09:47 -08:00
Stanislav Malyshev 22d8e9aced Merge branch 'PHP-7.0.4' into PHP-7.0 
* PHP-7.0.4: (21 commits)
  update NEWS
  fix test file
  Fix version
  update NEWS
  Update NEWS
  Fix bug #71610: Type Confusion Vulnerability - SOAP / make_http_soap_request()
  Fix bug #71637: Multiple Heap Overflow due to integer overflows
  extend check for add_flag
  Fixed another segfault with file_cache_only now
  set version
  fix nmake clean in phpize mode
  Fixed segfault with file_cache_only
  Fixed possible crash at PCRE on MSHUTDOWN
  Fixed more synchronisation issues during SHM reload
  Set proper type flags (REFCOUNTED and COPYABLE) according to interned or regular string
  sync with improvements in NEWS
  Fixed process synchronisation problem, that may cause crashes after opcache restart
  Fix bug #71498: Out-of-Bound Read in phar_parse_zipfile()
  fix ts buld
  prep for 5.6.19RC1
  ...

Conflicts:
	configure.in
	main/php_version.h
 2016-03-01 23:08:19 -08:00
Stanislav Malyshev 499c1e81a1 Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0 
* 'PHP-7.0' of git.php.net:php-src:
  limit size of result set so unit test runs reliably
 2016-03-01 23:07:49 -08:00
Stanislav Malyshev c69d80d701 update NEWS 2016-03-01 23:07:32 -08:00
Stanislav Malyshev 90a0cbd594 Merge branch 'PHP-5.6.19' into PHP-7.0.4 
* PHP-5.6.19:
  fix test file
  Fix version
  update NEWS
  Update NEWS
  Fix bug #71498: Out-of-Bound Read in phar_parse_zipfile()
  fix ts buld
  prep for 5.6.19RC1
  5.6.20 is next
  Fixed bug #71587 - Use-After-Free / Double-Free in WDDX Deserialize

Conflicts:
	configure.in
	ext/wddx/wddx.c
	main/php_version.h
 2016-03-01 23:01:48 -08:00
Stanislav Malyshev b3bb1aacfe Merge branch 'PHP-5.6.19' into PHP-5.6 
* PHP-5.6.19:
  fix test file
  Fix version
  Update NEWS
 2016-03-01 22:56:08 -08:00
Stanislav Malyshev 6e6a556b8c Merge branch 'PHP-5.5' into PHP-5.6.19 
* PHP-5.5:
  fix test file
  Fix version
  Update NEWS
 2016-03-01 22:55:49 -08:00
Stanislav Malyshev 3c8ccdd9d3 fix test file 2016-03-01 22:55:02 -08:00
Stanislav Malyshev 54df59b729 Fix version 2016-03-01 22:47:27 -08:00
Stanislav Malyshev ae3f132be1 Merge branch 'PHP-5.6.19' into PHP-5.6 
* PHP-5.6.19:
  update NEWS
  Fix bug #71498: Out-of-Bound Read in phar_parse_zipfile()
  fix ts buld
  prep for 5.6.19RC1
  Fixed bug #71587 - Use-After-Free / Double-Free in WDDX Deserialize
 2016-03-01 22:42:16 -08:00
Stanislav Malyshev a0bbac550e update NEWS 2016-03-01 22:41:10 -08:00
Stanislav Malyshev 91990bbde0 Merge branch 'PHP-5.5.33' into PHP-5.6.19 
* PHP-5.5.33:
  Fix bug #71498: Out-of-Bound Read in phar_parse_zipfile()
  Fixed bug #71587 - Use-After-Free / Double-Free in WDDX Deserialize
 2016-03-01 22:40:00 -08:00
Stanislav Malyshev 153a44d6bb Update NEWS 2016-03-01 22:37:23 -08:00
Stanislav Malyshev 07b6fc93b1 Fix bug #71610: Type Confusion Vulnerability - SOAP / make_http_soap_request() 2016-03-01 22:32:38 -08:00
Stanislav Malyshev 9cabc99fce Fix bug #71637: Multiple Heap Overflow due to integer overflows 2016-03-01 22:32:38 -08:00
Xinchen Hui 289e492251 Merge branch 'PHP-7.0' 
* PHP-7.0:
  limit size of result set so unit test runs reliably
 2016-03-02 14:27:20 +08:00
Xinchen Hui db68b8ea54 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  limit size of result set so unit test runs reliably
 2016-03-02 14:27:09 +08:00
Xinchen Hui 20add1e530 Merge branch 'PHP-5.6-bug_69757' of https://github.com/wayfair/php-src into PHP-5.6 
* 'PHP-5.6-bug_69757' of https://github.com/wayfair/php-src:
  limit size of result set so unit test runs reliably
 2016-03-02 14:26:34 +08:00
Stanislav Malyshev 6f8585fc7d Merge branch 'PHP-7.0.4' into PHP-7.0 
* PHP-7.0.4:
  Fix bug #71610: Type Confusion Vulnerability - SOAP / make_http_soap_request()
  Fix bug #71637: Multiple Heap Overflow due to integer overflows
  set versions

Conflicts:
	configure.in
	main/php_version.h
 2016-03-01 22:22:47 -08:00
Xinchen Hui 14f105ebba Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed test ext/readline/tests/readline_read_history_error_001.phpt
 2016-03-02 12:31:30 +08:00
Xinchen Hui 3fb566f475 Fixed test ext/readline/tests/readline_read_history_error_001.phpt 
This only pass with libedit
 2016-03-02 12:29:15 +08:00
Xinchen Hui f4f140c05d Merge branch 'PHP-7.0' 
* PHP-7.0:
  Use hash_exists_ind in symbol table
 2016-03-02 12:12:12 +08:00
Xinchen Hui 2d4186dde7 Use hash_exists_ind in symbol table 2016-03-02 12:11:13 +08:00
Nikita Popov 565f6bd374 Merge branch 'PHP-7.0' 2016-03-02 00:38:33 +01:00
Nikita Popov 726e87e142 Merge branch 'PHP-5.6' into PHP-7.0 2016-03-02 00:37:40 +01:00
Nikita Popov 471540d285 Fix intermittent failure of bug_68819_002.phpt 
The test used rand(32, 127) to select the character, however
chr(127) results in "data" instead of the expected result, so this
test would fail in something like 1% of the runs.

Replace rand() with fixed character "a".
 2016-03-02 00:34:36 +01:00
Nikita Popov 1d91b4e410 Merge branch 'PHP-7.0' 2016-03-01 23:33:05 +01:00
Nikita Popov dea2e1bc64 Merge branch 'PHP-5.6' into PHP-7.0 2016-03-01 23:32:47 +01:00
mpyw 0bbea60524 Fix bug #71694 
Exports contants CURLM_ADDED_ALREADY.
 2016-03-01 23:31:58 +01:00
Adam Baratz 2e18d438b0 limit size of result set so unit test runs reliably 2016-03-01 17:15:36 -05:00
Xinchen Hui 715a198e1f Merge branch 'PHP-7.0' 
* PHP-7.0:
  Maybe we should introduce a symtable_exists_ind
 2016-03-01 20:01:19 +08:00
Xinchen Hui 961c8d568d Maybe we should introduce a symtable_exists_ind 2016-03-01 20:01:02 +08:00
Xinchen Hui b17d2ad5f6 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #71695 (Global variables are reserved before execution).
 2016-03-01 19:21:16 +08:00
Xinchen Hui 996760f104 Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0 
* 'PHP-7.0' of git.php.net:/php-src:
  remove unused vars
  fix possible pointer truncation on win64
  Updated NEWS
  extend check for add_flag
  LDAP - Added support to change the certificates verification
 2016-03-01 19:20:57 +08:00