php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-28 10:43:30 +02:00
Code Issues Packages Projects Releases Wiki Activity
98,385 Commits 549 Branches 1,485 Tags
0dbcdceb280bc45553a4b048c7b78c55acee34bb
Commit Graph

43079 Commits

Author SHA1 Message Date
Julien Pauli 0dbcdceb28 Revert "PHP 7 compat" 
This reverts commit 24a57ee03b.
 2016-09-02 17:57:09 +02:00
Christoph M. Becker 67153d644d Fix typo 2016-09-02 17:34:11 +02:00
Julien Pauli 85ff5f9572 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fix warning about sign-mismatch comparisons
 2016-09-02 17:02:43 +02:00
Julien Pauli 24a57ee03b PHP 7 compat 2016-09-02 17:02:39 +02:00
Bishop Bettini 04115b4e3f Fixes #52384: Adds parameter value to dumped output. Also adds output flag indicating presence of PDO::PARAM_INPUT_OUTPUT. 
Conflicts:
	ext/pdo/pdo_stmt.c
 2016-09-02 17:02:39 +02:00
Julien Pauli e681b8771b Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix warning about sign-mismatch comparisons
 2016-09-02 17:02:25 +02:00
Julien Pauli e14b14d026 Fix warning about sign-mismatch comparisons 2016-09-02 17:01:52 +02:00
Stanislav Malyshev 9ca79ad832 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fix bug #72910
  5.6.27 will be next
 2016-09-01 23:29:34 -07:00
Stanislav Malyshev 01f4a52aaa Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #72910
  5.6.27 will be next
 2016-09-01 23:29:17 -07:00
Stanislav Malyshev ccc8d92d3d Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix bug #72910
  5.6.27 will be next
 2016-09-01 23:28:44 -07:00
Stanislav Malyshev e576714f6b Fix bug #72910 
Merge upstream patch from https://github.com/kkos/oniguruma/commit/65bdf2a0d160d06556415e5f396a75f6b11bad5c
 2016-09-01 23:27:06 -07:00
Yasuo Ohgaki b651b96738 Allow array input for mb_check_encoding() 2016-09-02 14:18:34 +09:00
Anatol Belski edc4de58b7 Merge branch 'PHP-7.1' 
* PHP-7.1:
  fix useless assignment
  avoid needless function call
  remove useless assignment
  remove unused assignment
  rewrite the getcwd part
  fix leak
  fix unused assignment
  remove duplicated symbol
 2016-09-01 23:54:33 +02:00
Anatol Belski f1cf26ea4f fix useless assignment 2016-09-01 23:45:31 +02:00
Anatol Belski 1d64b4c71e avoid needless function call 2016-09-01 23:45:31 +02:00
Anatol Belski a989091880 remove useless assignment 2016-09-01 23:45:31 +02:00
Remi Collet 72ac143f9f Merge branch 'PHP-7.1' 
* PHP-7.1:
  Revert 	39587c4817 	8b7f594a2b Because of 	24fdffdacb
 2016-09-01 15:23:35 +02:00
Remi Collet 5a9691bf08 Revert 
39587c4817
	8b7f594a2b
Because of
	24fdffdacb
 2016-09-01 15:21:45 +02:00
Nikita Popov b25d6b3c8a Merge branch 'PHP-7.1' 2016-09-01 13:01:58 +02:00
Márcio Almada cba560e67f add extra test to protected behavior of compact and array string key order 2016-09-01 13:01:42 +02:00
Márcio Almada 00c2c3a476 fix unintentional bc break with compact('this') behavior 2016-09-01 13:01:38 +02:00
Xinchen Hui 4b1bc2bd29 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Update NEWS
  Fixed bug #72982 (Memory leak in zend_accel_blacklist_update_regexp() function)
  Update NEWS and UPGRADING
  Revert "Revert "Implement RFC Add session_gc() https://wiki.php.net/rfc/session-gc""
  Revert "Revert "Merge RFC https://wiki.php.net/rfc/session-create-id""
  Revert "Revert "Add tests""
  Revert "Fix NEWS"
 2016-09-01 12:11:39 +08:00
Xinchen Hui 5f3a26c741 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #72982 (Memory leak in zend_accel_blacklist_update_regexp() function)
 2016-09-01 12:10:54 +08:00
Xinchen Hui 1ee41683dc Fixed bug #72982 (Memory leak in zend_accel_blacklist_update_regexp() function) 2016-09-01 12:10:38 +08:00
Yasuo Ohgaki a4a2f66e75 Revert "Revert "Implement RFC Add session_gc() https://wiki.php.net/rfc/session-gc"" 
This reverts commit 355c7e7d1c.
 2016-09-01 10:12:26 +09:00
Yasuo Ohgaki b36ae7467e Revert "Revert "Merge RFC https://wiki.php.net/rfc/session-create-id"" 
This reverts commit 663f1c8fb0.
 2016-09-01 10:12:23 +09:00
Yasuo Ohgaki 7505eaf6fa Revert "Revert "Add tests"" 
This reverts commit 4f11dedc43.
 2016-09-01 10:12:19 +09:00
Yasuo Ohgaki 991d66052b Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fix bug #72940 properly. Reduce needless branches
 2016-09-01 08:10:35 +09:00
Yasuo Ohgaki 90352bb4a2 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #72940 properly. Reduce needless branches
 2016-09-01 07:47:27 +09:00
Yasuo Ohgaki cc797d4fc3 Fix bug #72940 properly. Reduce needless branches 2016-09-01 07:47:13 +09:00
Yasuo Ohgaki 355c7e7d1c Revert "Implement RFC Add session_gc() https://wiki.php.net/rfc/session-gc" 
This reverts commit 1cf179e415.
 2016-09-01 05:54:55 +09:00
Yasuo Ohgaki 663f1c8fb0 Revert "Merge RFC https://wiki.php.net/rfc/session-create-id" 
This reverts commit 7ee9f81c54.
 2016-09-01 05:54:30 +09:00
Yasuo Ohgaki 4f11dedc43 Revert "Add tests" 
This reverts commit aff4c7d826.
 2016-09-01 05:54:19 +09:00
Christoph M. Becker b51dca5eb4 Merge branch 'PHP-7.1' 2016-08-31 16:52:37 +02:00
Christoph M. Becker 9cc11dbded Merge branch 'PHP-7.0' into PHP-7.1 2016-08-31 16:45:15 +02:00
Christoph M. Becker f93fd8ce32 Merge branch 'PHP-5.6' into PHP-7.0 2016-08-31 16:38:38 +02:00
Christoph M. Becker b2d267d9ee Fix #71882 amendment 2: Negative ftruncate() on php://memory exhausts memory 2016-08-31 16:33:14 +02:00
Christoph M. Becker 8f32d609c5 Merge branch 'PHP-5.6' into PHP-7.0 2016-08-31 14:53:53 +02:00
Christoph M. Becker 314a9f8553 Fix #71882 amendment: Negative ftruncate() on php://memory exhausts memory 
To avoid BC breaks, we do not raise a warning for now.
 2016-08-31 14:51:37 +02:00
Christoph M. Becker b0eeb33f73 Merge branch 'PHP-7.1' 2016-08-31 14:33:43 +02:00
Christoph M. Becker 56ed966bc6 Merge branch 'PHP-7.0' into PHP-7.1 2016-08-31 14:32:24 +02:00
Yasuo Ohgaki 61769e275b Merge branch 'PHP-7.1' 
* PHP-7.1:
  Add tests
 2016-08-31 21:03:38 +09:00
Yasuo Ohgaki aff4c7d826 Add tests 2016-08-31 21:03:10 +09:00
Yasuo Ohgaki ef8004db3d Merge branch 'PHP-7.1' 
* PHP-7.1:
  Merge RFC https://wiki.php.net/rfc/session-create-id
 2016-08-31 20:34:43 +09:00
Yasuo Ohgaki 7ee9f81c54 Merge RFC https://wiki.php.net/rfc/session-create-id 2016-08-31 20:34:20 +09:00
Christoph M. Becker 08a71df612 Merge branch 'PHP-5.6' into PHP-7.0 2016-08-31 13:27:23 +02:00
Christoph M. Becker f215fb874f Fix #71882 amendment: Negative ftruncate() on php://memory exhausts memory 
To avoid BC breaks, we do not raise a warning for now.
 2016-08-31 13:24:37 +02:00
Anatol Belski 1dac6c7b96 Merge branch 'PHP-7.1' 
* PHP-7.1:
  sync tests
 2016-08-31 12:27:14 +02:00
Anatol Belski aeb7b4094a sync tests 2016-08-31 12:26:51 +02:00
Anatol Belski c563db6b44 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Update NEWS
  Implement \ArgumentCountError exception
 2016-08-31 12:07:38 +02:00