php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-04 22:52:40 +02:00
Code Issues Packages Projects Releases Wiki Activity
93,638 Commits 547 Branches 1,481 Tags
afedd4fd59afa73ebebb46caf6ddfa8aa338bea6
Commit Graph

40435 Commits

Author SHA1 Message Date
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
ab800642df Introduce zend_symtable_exists_ind() for API consistency 2016-03-02 11:53:47 +03:00
Stanislav Malyshev
1ce0ea7396 fix wddx merge 2016-03-02 00:02:33 -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
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
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
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
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
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
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
2d4186dde7 Use hash_exists_ind in symbol table 2016-03-02 12:11:13 +08: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
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
961c8d568d Maybe we should introduce a symtable_exists_ind 2016-03-01 20:01:02 +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
Xinchen Hui
186844be92 Fixed bug #71695 (Global variables are reserved before execution). 
Instead of slow down hash_merge, we may also check the array(whether it
contains INDIRECT) outside of the loop, however, consisdering hash_merge
is not widly used, I prefer fix this in the current way to keep the
codes simple
 2016-03-01 19:19:07 +08:00
Anatol Belski
655e5dd99d remove unused vars 2016-03-01 10:52:49 +01:00
Anatol Belski
acbbe76d7b fix possible pointer truncation on win64 2016-03-01 10:51:55 +01:00
Xinchen Hui
08af2f9a11 Fixed another segfault with file_cache_only now 2016-03-01 08:21:14 +01:00
Edwin Hoksberg
ba96506676 LDAP - Added support to change the certificates verification 2016-03-01 04:59:30 +01:00
Xinchen Hui
9fc0517328 Fixed another segfault with file_cache_only now 2016-03-01 10:50:56 +08:00
Nikita Popov
a6afaa9a85 Merge branch 'PHP-5.6' into PHP-7.0 
Conflicts:
	ext/phar/tar.c
 2016-02-29 22:44:46 +01:00
Jos Elstgeest
50b4cafd28 Fixed bugs #71317 and #71504 
If there are duplicate filenames in tar, the last one wins.
 2016-02-29 22:34:35 +01:00
Anatol Belski
31dc08a904 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  add test for bug #68957
 2016-02-29 18:44:15 +01:00
Anatol Belski
d78220fb2c add test for bug #68957 2016-02-29 18:43:03 +01:00
Anatol Belski
56ab4a6096 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fixed #54648 PDO::MSSQL forces format of datetime fields
 2016-02-29 17:07:05 +01:00
Anatol Belski
53c036b30b Fixed #54648 PDO::MSSQL forces format of datetime fields 
adopted patch by steven dot lambeth at gmx dot de
 2016-02-29 17:04:49 +01:00
Anatol Belski
44c3f1492f Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  remove unneeded free parts
 2016-02-29 16:30:33 +01:00
Anatol Belski
7816698580 remove unneeded free parts 
See bug #71667, free_statement already does the job
 2016-02-29 16:26:46 +01:00
Anatol Belski
f806fedd80 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix leaks and add one more NULL check
  add NULL check
  fix C89 compat
  fix arg type
 2016-02-29 15:48:51 +01:00
Anatol Belski
d7fd614cc6 fix leaks and add one more NULL check 2016-02-29 15:38:42 +01:00
Anatol Belski
a310c3b484 add NULL check 2016-02-29 15:26:57 +01:00
Anatol Belski
efaafd45b4 fix C89 compat 2016-02-29 15:24:31 +01:00
Anatol Belski
35be4398d1 fix arg type 2016-02-29 15:23:53 +01:00
Xinchen Hui
b79b036a31 The test self should be fixed(maybe relates to env?) 
Revert "Fixed test ext/readline/tests/readline_read_history_error_001.phpt"

This reverts commit 69e26f9f8f.
 2016-02-29 15:19:18 +08:00
Xinchen Hui
d0b3a72cea Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0 
* 'PHP-7.0' of git.php.net:/php-src:
  test fixes
  update NEWS
  Fix bug #71536 Access Violation crashes php-cgi.exe
 2016-02-29 15:07:38 +08:00
Xinchen Hui
69e26f9f8f Fixed test ext/readline/tests/readline_read_history_error_001.phpt 2016-02-29 15:07:19 +08:00
Xinchen Hui
6adfc20f04 Fixed segfault with file_cache_only 2016-02-28 15:54:01 +01:00
Anatol Belski
f738abab85 test fixes 2016-02-28 11:53:21 +01:00
Anatol Belski
93592a9c08 Fix bug #71536 Access Violation crashes php-cgi.exe 2016-02-28 11:02:01 +01:00
Xinchen Hui
8c053d44e4 Fixed segfault with file_cache_only 2016-02-28 11:50:06 +08:00
Dmitry Stogov
e2bf86fbfd Fixed possible crash at PCRE on MSHUTDOWN 2016-02-26 15:14:20 +01:00