1
0
mirror of https://github.com/php/php-src.git synced 2026-04-30 03:33:17 +02:00
Commit Graph

1271 Commits

Author SHA1 Message Date
Aaron Piotrowski 24237027bc Merge branch 'throw-error-in-extensions' 2016-07-05 02:08:39 -05:00
Xinchen Hui 72ec312f23 Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed bug #72531 (ps_files_cleanup_dir Buffer overflow)
2016-07-03 09:30:48 +08:00
Xinchen Hui 6744737577 Fixed bug #72531 (ps_files_cleanup_dir Buffer overflow) 2016-07-03 09:30:33 +08:00
Dmitry Stogov 323b2733f6 Fixed compilation warnings 2016-06-22 00:40:50 +03:00
Dmitry Stogov ccf4ae95bd Restored signed format specifier 2016-06-21 20:12:04 +03:00
Dmitry Stogov a0df06fc4b Revert "sync tests with the latest format fixes"
This reverts commit ef7116d55b.
2016-06-21 20:10:44 +03:00
Anatol Belski ef7116d55b sync tests with the latest format fixes 2016-06-21 19:06:28 +02:00
Dmitry Stogov 1616038698 Added ZEND_ATTRIBUTE_FORMAT to some middind functions.
"%p" replaced by ZEND_LONG_FMT to avoid compilation warnings.
Fixed most incorrect use cases of format specifiers.
2016-06-21 16:00:37 +03:00
Aaron Piotrowski 7d53864574 E_RECOVERABLE_ERROR -> thrown Error 2016-06-14 13:18:43 -05:00
Aaron Piotrowski 771e5cc247 Replace zend_ce_error with NULL and replace more E_ERROR with thrown Error 2016-06-13 09:02:17 -05:00
Aaron Piotrowski e3c681aa5c Merge branch 'master' into throw-error-in-extensions 2016-06-10 22:02:23 -05:00
Christoph M. Becker 74c06a64f0 Merge branch 'PHP-7.0' 2016-06-09 15:45:54 +02:00
Christoph M. Becker 07a793810f Merge branch 'PHP-5.6' into PHP-7.0 2016-06-09 15:35:28 +02:00
Raphaël Tournoy 1dfdae6de4 fix typo 2016-06-03 17:18:14 +02:00
Xinchen Hui d5914d19eb Merge branch 'PHP-7.0' 2016-04-15 21:09:05 -07:00
Xinchen Hui 05d53dee7d Fixed bug #71972 (Cyclic references causing session_start(): Failed to decode session object) 2016-04-15 21:08:51 -07:00
Yasuo Ohgaki dc9ae10bc4 Remove debug code 2016-04-07 17:13:05 +09:00
Yasuo Ohgaki 60b144134a Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed Bug #71974 Trans sid will always be send, even if cookies are available
2016-04-07 10:26:32 +09:00
Yasuo Ohgaki 6467a4eb36 Fixed Bug #71974 Trans sid will always be send, even if cookies are available 2016-04-07 10:26:05 +09:00
Yasuo Ohgaki 01579ae0a6 Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed Bug #71683 Null pointer dereference in zend_hash_str_find_bucket
2016-03-12 08:33:04 +09:00
Yasuo Ohgaki 50fca7a02a Fixed Bug #71683 Null pointer dereference in zend_hash_str_find_bucket 2016-03-12 08:15:47 +09:00
Xinchen Hui 4c388004d4 Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed bug #71754 (Regression in PHP7.0: trivial script segfaults php-cgi)
  Bug #71756 (Call-by-reference widens scope to uninvolved functions when used in switch)
  tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752)
2016-03-10 15:03:25 +08:00
Xinchen Hui 98c625a31c Fixed bug #71754 (Regression in PHP7.0: trivial script segfaults php-cgi) 2016-03-10 15:02:10 +08:00
Nikita Popov f57c0b3249 Merge branch 'PHP-7.0' 2016-03-03 16:50:47 +01:00
Nikita Popov 1ac152938c Move semicolon into TSRMLS_CACHE_EXTERN/DEFINE
Also re bug #71575.
2016-03-03 16:50:01 +01:00
Nikita Popov a4e56194d7 Fix intermixed SKIPIF and XFAIL sections in test 2016-03-03 16:38:05 +01:00
Rouven Weßling a61029b155 Replace usage of php_int32 and php_uint32 with int32_t and uint32_t 2016-02-04 11:57:41 +01:00
Antony Dovgal 6f81e95c33 check length first, prevent out-of-bounds read 2016-02-03 14:49:16 +03:00
Antony Dovgal 64e8cfadf5 check length first, prevent out-of-bounds read 2016-02-03 14:48:38 +03:00
Anatol Belski 1df334b75c revert test to the previous master state 2016-01-29 22:37:37 +01:00
Anatol Belski 620f4169a7 Merge branch 'PHP-7.0'
* PHP-7.0:
  yet one revert
  Revert "adjust test for 7.0"

Conflicts:
	ext/session/tests/bug69111.phpt
2016-01-29 21:46:15 +01:00
Anatol Belski b947aff98d yet one revert 2016-01-29 21:43:14 +01:00
Anatol Belski ac22f71477 Revert "adjust test for 7.0"
This reverts commit 7fdb019e66.
2016-01-29 21:27:22 +01:00
Anatol Belski 58b2344759 Merge branch 'PHP-7.0'
* PHP-7.0:
  Revert "refix #69111 and one related test"
  Revert "fix yet another leak"
  add XFAIL
  Revert "refix #69111 and one related test"
  Revert "fix tests"
  Revert "fix leak in 7.0"
  add XFAIL
  Revert "fix leak in 5.6"

Conflicts:
	ext/session/tests/rfc1867_sid_invalid.phpt
2016-01-29 21:07:19 +01:00
Anatol Belski 6891e6abdf Revert "refix #69111 and one related test"
This reverts commit 80f7b01258.

Conflicts:
	ext/session/mod_files.c
2016-01-29 20:59:58 +01:00
Anatol Belski 3d90531d1e Revert "fix yet another leak"
This reverts commit 39084ccc68.
2016-01-29 20:58:00 +01:00
Anatol Belski d1d3c0832e add XFAIL 2016-01-29 20:57:05 +01:00
Anatol Belski ebcfe7618d Revert "refix #69111 and one related test"
This reverts commit 80f7b01258.
2016-01-29 20:50:14 +01:00
Anatol Belski 7f977c13dc Revert "fix tests"
This reverts commit d964ccba40.
2016-01-29 20:49:52 +01:00
Anatol Belski 57d9797b6f Revert "fix leak in 7.0"
This reverts commit ee49df011c.
2016-01-29 20:46:47 +01:00
Anatol Belski b7dadfae87 add XFAIL 2016-01-29 20:36:11 +01:00
Anatol Belski 40b9f52c2c Revert "fix leak in 5.6"
This reverts commit fa548e5ca9.
2016-01-29 20:33:39 +01:00
Anatol Belski 1a9402c6ec Merge branch 'PHP-7.0'
* PHP-7.0:
  refix #69111 and one related test

Conflicts:
	ext/session/tests/rfc1867_sid_invalid.phpt
2016-01-29 19:59:26 +01:00
Anatol Belski 80f7b01258 refix #69111 and one related test
It is the least evil as the test just reduces the fail path. 5.6 seems
still broken in this regard, a backport should follow if travis is happy.
2016-01-29 19:55:50 +01:00
Anatol Belski 6cc01882fb Merge branch 'PHP-7.0'
* PHP-7.0:
  fix tests
2016-01-29 16:33:19 +01:00
Anatol Belski d964ccba40 fix tests 2016-01-29 16:32:27 +01:00
Anatol Belski f1dc4a4e10 Merge branch 'PHP-7.0'
* PHP-7.0:
  fix yet another leak
2016-01-29 16:04:13 +01:00
Anatol Belski 39084ccc68 fix yet another leak 2016-01-29 16:03:33 +01:00
Anatol Belski 15ba618a69 Merge branch 'PHP-7.0'
* PHP-7.0:
  fix wrong gc sequence
2016-01-29 15:19:40 +01:00
Anatol Belski d2c752d7e9 fix wrong gc sequence 2016-01-29 15:18:59 +01:00