php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-29 11:13:36 +02:00
Code Issues Packages Projects Releases Wiki Activity
94,396 Commits 549 Branches 1,486 Tags
60fc27f912f2ef3a8ca6dbcae8f77dcf3ff2ed2a
Commit Graph

94396 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christoph M. Becker 60fc27f912 Merge branch 'PHP-5.6' into PHP-7.0 2016-07-04 03:18:50 +02:00
Christoph M. Becker 717a043a32 Fix typo in comment 2016-07-04 03:17:17 +02:00
Ferenc Kovacs 50433f708e Merge branch 'PHP-5.6' into PHP-7.0 2016-07-03 23:35:00 +02:00
Ferenc Kovacs 9a9ede00bc this was actually fixed in 5.6.23 2016-07-03 23:31:32 +02:00
Xinchen Hui f6aaaf02a9 Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0 
* 'PHP-7.0' of git.php.net:/php-src:
  update NEWS
  extend test
  Fixed bug #72534 stream_socket_get_name crashes
 2016-07-03 23:57:42 +08:00
Xinchen Hui 612aff3a8a Fixed bug #72538 (readline_redisplay crashes php) 2016-07-03 23:56:27 +08:00
Anatol Belski b90c2fc7b9 update NEWS 2016-07-03 17:15:19 +02:00
Anatol Belski 8b229bfeeb extend test 2016-07-03 17:13:46 +02:00
Anatol Belski ea9da7529c Fixed bug #72534 stream_socket_get_name crashes 2016-07-03 17:09:19 +02:00
Xinchen Hui 6744737577 Fixed bug #72531 (ps_files_cleanup_dir Buffer overflow) 2016-07-03 09:30:33 +08:00
Anatol Belski c9fa39da5e update NEWS 2016-07-01 18:44:20 +02:00
Anatol Belski 3455848dfe Fixed bug #72498 variant_date_from_timestamp null dereference 2016-07-01 18:41:50 +02:00
Nikita Popov 9b8f1d6037 Don't use FUNC_ARG fetches for call_user_func() 
This makes no sense -- SEND_USER can't even handle INDIRECTs.
 2016-06-28 21:34:20 +02:00
Nikita Popov fafe01b07b Make call_user_func() on reference args consistent 
Previously reference arguments were allowed if call_user_func()
was compiled to SEND_USER and not otherwise. Make it consistent
by always forbidding them.
 2016-06-28 20:43:38 +02:00
Xinchen Hui 76370f30db Fixed test 2016-06-28 15:39:02 +08:00
Xinchen Hui ce7e180a04 Fixed bug #72508 (strange references after recursive function call and "switch" statement) 2016-06-28 15:36:50 +08:00
Xinchen Hui de7a6b1232 MFH: Fixed fd leak (the origin commit can not be cherry-picked) 2016-06-28 11:36:27 +08:00
Xinchen Hui 86732b4ea0 Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0 
* 'PHP-7.0' of git.php.net:/php-src:
  Fix the fix for #72403 on nl2br
  Update NEWS
  Update NEWS
  Fix #70628: Clearing bindings on an SQLite3 statement doesn't work
  5.5.38 now
 2016-06-28 11:11:39 +08:00
Xinchen Hui c73a2f7f45 Fixed bug #72505 (readfile() mangles files larger than 2G) 2016-06-28 11:11:25 +08:00
Stanislav Malyshev ec82c6b4e1 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix the fix for #72403 on nl2br
  5.5.38 now

Conflicts:
	ext/standard/string.c
 2016-06-27 12:32:58 -07:00
Stanislav Malyshev b8487b6a7d Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix the fix for #72403 on nl2br
  5.5.38 now

Conflicts:
	configure.in
	main/php_version.h
 2016-06-27 12:32:11 -07:00
Stanislav Malyshev 25bd11cf27 Fix the fix for #72403 on nl2br 2016-06-27 12:30:42 -07:00
Christoph M. Becker b5fc4dbf21 Update NEWS 2016-06-27 17:17:34 +02:00
Christoph M. Becker 0f03224d59 Merge branch 'PHP-5.6' into PHP-7.0 2016-06-27 17:09:55 +02:00
Christoph M. Becker 1314db7109 Update NEWS 2016-06-27 17:07:26 +02:00
Christoph M. Becker 57940605da Fix #70628: Clearing bindings on an SQLite3 statement doesn't work 
Obiously, it isn't sufficient to call sqlite3_clear_bindings() alone, but
also the bound_params of the php_sqlite3_stmt have to be cleared.
 2016-06-27 17:06:27 +02:00
Lior Kaplan ad32c7b538 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Add CVE info for PHP 5.6.22
  Add CVE info for PHP 5.6.23
  Add missing entries for PHP 5.6.23
 2016-06-25 21:32:38 +03:00
Lior Kaplan d826bdf1c7 Align NEWS files with 7.0.8 and Changelog 2016-06-25 21:25:57 +03:00
Lior Kaplan b4873e57b4 Add CVE info for PHP 5.6.22 2016-06-25 20:31:26 +03:00
Lior Kaplan 6bd527771c Add CVE info for PHP 5.6.23 2016-06-25 20:28:51 +03:00
Lior Kaplan 02c24be8e4 Add missing entries for PHP 5.6.23 2016-06-25 19:56:00 +03:00
Xinchen Hui 0183a9af5a Fixed bug #72484 (SCRIPT_FILENAME shows wrong path if the user specify router.php) 2016-06-24 18:08:16 -07:00
Xinchen Hui 53de1c2830 Fixed format 2016-06-24 21:13:04 +08:00
Anatol Belski 056c2ce349 yet another test rewrite 2016-06-23 09:42:17 +02:00
Xinchen Hui bd74e7d013 Fixed bug #72476 (Memleak in jit_stack) 2016-06-23 14:06:48 +08:00
Anatol Belski f90c832cb2 update NEWS 2016-06-22 20:19:09 +02:00
Anatol Belski 4edbac6ec5 rewrite test 2016-06-22 19:46:02 +02:00
Anatol Belski e453904251 Fixed bug #72463 mail fails with invalid argument 2016-06-22 19:06:33 +02:00
Dmitry Stogov 3c84e5e1ce Allow "proxy" ovjects to substitute their class names through get_class_name() handler (similar to var_dump() and others). 2016-06-22 17:23:04 +03:00
Anatol Belski c196f9cdf7 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix test cleanup
 2016-06-22 12:22:03 +02:00
Anatol Belski 4638ba9c07 fix test cleanup 2016-06-22 12:20:02 +02:00
Anatol Belski 98f6248dcf Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix dir separator in test
 2016-06-22 11:44:14 +02:00
Anatol Belski de1c407348 fix dir separator in test 2016-06-22 11:41:05 +02:00
Ferenc Kovacs 63d5e21f42 Merge branch 'PHP-5.6' into PHP-7.0 2016-06-22 03:08:10 +02:00
Ferenc Kovacs ba980d0a62 update NEWS 2016-06-22 03:03:01 +02:00
Anatol Belski ed10168b30 fix two remaining tests 2016-06-21 17:24:08 +02:00
Anatol Belski 1d5a4520be Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix test
 2016-06-21 16:22:51 +02:00
Anatol Belski e3bd360ec9 fix test 
There is a difference between TS and NTS warning message, since
virtual_mkdir vs glibc directly is used. This has no effect for
the actual fix functionality.
 2016-06-21 16:20:03 +02:00
Anatol Belski 5a9f0c77ad re-fix leak 2016-06-21 15:21:58 +02:00
Anatol Belski 7002c32809 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  re-fix leak
  Revert "fix leak"
 2016-06-21 15:21:26 +02:00