clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 10:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
91,312 Commits 491 Branches 1,363 Tags 844 MiB
20e5027293
Commit Graph

91312 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Magnus Määttä
963d906aff Add posix_setrlimit() FR #54603 2015-07-08 22:12:07 +02:00
Dmitry Stogov
301ee26568 Fixed situation, when CHECH_EXCEPTION() might change value of "opline" variable and the following "opline" useages would access elements of different opcode. That might lead to unpredictable behavior. (Only PHP-7 with GCC global register variables was affected). 
CHECK_EXCEPTION() macro is removed. ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTIO() should be used instead. It's equivalent to old CHECK_EXCEPTION() + ZEND_VM_NEXT_OPCODE().
As a side effect, this also slightly improved performnce of builds with GCC >= 4.8.
 2015-07-08 18:33:58 +03:00
Julien Pauli
993a658ada Merge branch 'PHP-5.6' 
* PHP-5.6:
  5.5.27 release
 2015-07-08 17:00:47 +02:00
Julien Pauli
b1a9b89773 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  5.5.27 release

Conflicts:
	main/php_version.h
 2015-07-08 17:00:29 +02:00
Julien Pauli
34b624f122 5.5.27 release 2015-07-08 16:59:44 +02:00
Bob Weinand
3ccc17cee5 Working fix for ctrl+d on readline/libedit 2015-07-08 16:54:41 +02:00
Xinchen Hui
5460929077 Merge branch 'PHP-5.6' 2015-07-08 22:35:10 +08:00
Xinchen Hui
c75d245e82 Revert "Fixed invalid read" 
I must be confused while switching from master to 5.6

This reverts commit 94957a7091.
 2015-07-08 22:34:27 +08:00
Xinchen Hui
ffccf19fa6 Merge branch 'master' of git.php.net:php-src 2015-07-08 19:31:36 +08:00
Xinchen Hui
da333bfbd8 Fixed bug #70018 (exec does not strip all whitespace) 
Merge branch 'PHP-5.6'

Conflicts:
	ext/standard/exec.c
 2015-07-08 19:30:58 +08:00
Anatol Belski
dd1f0940fe fix NEWS 2015-07-08 13:27:34 +02:00
Xinchen Hui
94957a7091 Fixed invalid read 2015-07-08 19:19:37 +08:00
Xinchen Hui
f9dc60f36f Merge branch 'master' of git.php.net:php-src 2015-07-08 18:25:04 +08:00
Xinchen Hui
b9e48073b3 Make sure fast_call_var is initialized properly 2015-07-08 18:24:27 +08:00
Nikita Popov
ed14019e8c Add assertion in liveliness computation 
Assert that a live-range does not start, while one for the same
variable is already active.

To satisfy this constraint, explicitly exclude writes from JMP_SET
and COALESCE. They were previously also handled correctly, because
their result variable was only killed after the second write to it
after the false branch. This just makes it more explicit.
 2015-07-08 12:00:39 +02:00
Xinchen Hui
249915f938 Add comment to explaining the new check 2015-07-08 17:44:54 +08:00
Xinchen Hui
3b5876916d Remove outdate comment 2015-07-08 17:42:50 +08:00
Xinchen Hui
c6037bd3af Fixed bug #70012 (Exception lost with nested finally block) 2015-07-08 17:15:09 +08:00
Xinchen Hui
6154fc77be Merge branch 'PHP-5.6' 2015-07-08 17:14:32 +08:00
Xinchen Hui
ca30d5bf39 Fixed bug #70012 (Exception lost with nested finally block) 2015-07-08 17:14:19 +08:00
Aaron Piotrowski
1c7619491e Fix failing tests from exception code changes 2015-07-07 23:14:05 -05:00
Kalle Sommer Nielsen
b84363f7fa PHP 7.0.0 Beta 2 NEWS 2015-07-08 02:37:59 +02:00
Nikita Popov
1852f538b9 ZEND_SEPARATE reuses temporaries 2015-07-08 00:13:23 +02:00
Aaron Piotrowski
a1a83bf5f0 Switch code on thrown TypeError and ParseError to 0, update related tests 2015-07-07 16:54:39 -05:00
Christoph M. Becker
dbadf447b2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fixed typo in test for bug #66985
 2015-07-07 23:39:18 +02:00
Christoph M. Becker
e68b5252a2 fixed typo in test for bug #66985 2015-07-07 23:35:28 +02:00
Bob Weinand
7a8ea0f60d Properly exit on EOF on stdin in readline mode 2015-07-07 22:45:34 +02:00
Nikita Popov
b3a4c05071 Remove loop_var_stack 
Instead add a loop_var member to brk_cont_element. Now that
brk_cont is compile-time the distinction is no longer necessary.

Also drops brk_cont.start, check the loop_var op_type instead.
 2015-07-07 20:55:12 +02:00
Rasmus Lerdorf
40ca0f1927 SQLite3::open/__construct has 2 optional args 2015-07-07 11:53:07 -07:00
Stanislav Malyshev
a5e7075d79 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Better fix for bug #69958
  update news
  Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
  Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
  Fix bug #69958 - Segfault in Phar::convertToData on invalid file
  Better fix for bug #69958
  Better fix for bug #69958
  update news
  Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
  Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
  Fix bug #69958 - Segfault in Phar::convertToData on invalid file

Conflicts:
	ext/mysqlnd/mysqlnd.c
	ext/phar/phar_object.c
 2015-07-07 10:19:20 -07:00
Stanislav Malyshev
2d0771d66c Better fix for bug #69958 2015-07-07 10:18:22 -07:00
Stanislav Malyshev
3bee16a70a Better fix for bug #69958 2015-07-07 10:17:54 -07:00
Stanislav Malyshev
d8aa5675ad Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM) 2015-07-07 10:16:54 -07:00
Stanislav Malyshev
12ff95574b Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath 2015-07-07 10:15:41 -07:00
Stanislav Malyshev
00f177a5ed Fix bug #69958 - Segfault in Phar::convertToData on invalid file 2015-07-07 10:15:41 -07:00
Stanislav Malyshev
6c884e8e84 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Better fix for bug #69958
  update news
  Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
  Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
  Fix bug #69958 - Segfault in Phar::convertToData on invalid file
  Better fix for bug #69958
  Better fix for bug #69958
  update news
  Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
  Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
  Fix bug #69958 - Segfault in Phar::convertToData on invalid file

Conflicts:
	ext/phar/phar_object.c
 2015-07-07 10:12:51 -07:00
Aaron Piotrowski
5df893ce3c Use NULL where possible for exception class 
Matches usage of zend_throw_exception()/zend_throw_exception_ex().
 2015-07-07 12:10:55 -05:00
Aaron Piotrowski
29c3cd4448 Allow NULL for exception_ce 2015-07-07 12:10:55 -05:00
Stanislav Malyshev
b4b082e63e Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Better fix for bug #69958
  update news
  Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
  Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
  Fix bug #69958 - Segfault in Phar::convertToData on invalid file

Conflicts:
	ext/mysqlnd/mysqlnd.c
 2015-07-07 10:09:34 -07:00
Stanislav Malyshev
545eddba93 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 
* 'PHP-5.5' of git.php.net:php-src:
  add missing second argument for ucfirst to the proto
 2015-07-07 10:08:37 -07:00
Anatol Belski
54bcc6280c Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix C89 compat
 2015-07-07 18:40:16 +02:00
Anatol Belski
c0142de470 fix C89 compat 2015-07-07 18:39:33 +02:00
Stanislav Malyshev
885edfef0a Better fix for bug #69958 2015-07-07 09:38:31 -07:00
Stanislav Malyshev
c8157619ef update news 2015-07-07 09:38:31 -07:00
Stanislav Malyshev
97aa752fee Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM) 2015-07-07 09:38:31 -07:00
Stanislav Malyshev
6dedeb40db Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath 2015-07-07 09:38:31 -07:00
Stanislav Malyshev
bf58162ddf Fix bug #69958 - Segfault in Phar::convertToData on invalid file 2015-07-07 09:38:30 -07:00
Kalle Sommer Nielsen
fe842a8510 fix C89 compat 2015-07-07 18:26:14 +02:00
Anatol Belski
aaee58ecc4 added info about the user space stream context for pipes 2015-07-07 17:11:24 +02:00
Anatol Belski
4bf70f4d98 mention pcre.jit in the supplied php.ini-* 2015-07-07 16:15:56 +02:00