clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 14:56:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
90,310 Commits 494 Branches 1,367 Tags 801 MiB
042ecad749
Commit Graph

90310 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Remi Collet
e807e07bfa Fixed Bug #69479 GD fails to build with newer libvpx 
From upstream d41eb72cd4

Fix build with latest libvpx 1.4.0

These new constants exist at least since 1.0.0
Compatibility ones have been droped in 1.4.0
 2015-05-24 09:37:12 +02:00
Xinchen Hui
61f652a179 Merge branch 'master' into merge-fastcgi 2015-05-24 14:23:34 +08:00
Xinchen Hui
231f059d8c fcgi_is_allowed should not log error 2015-05-24 14:21:04 +08:00
Xinchen Hui
9dbf8794bb Merge pull request #1 from weltling/merge-fastcgi 
Missing symbols to get it worky on Windows
 2015-05-24 10:09:59 +08:00
Anatol Belski
35ba1601f5 Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
 2015-05-23 23:02:47 +02:00
Anatol Belski
4e002b4412 updated NEWS 2015-05-23 23:02:09 +02:00
Nikita Popov
f3dde29394 Fixes for x32 ABI 
I'm assuming that we want to have 64bit zend_longs on x32 here.

This fixes two typos in __x86_64__ macros and adds sign-extension
when assigning STREAM_COPY_ALL to zend_long.
 2015-05-23 21:18:33 +02:00
Anatol Belski
0512b38309 add the remaining useful symbols to the export 2015-05-23 21:00:47 +02:00
Anatol Belski
1411ca58b1 implement necessary symbol exports 2015-05-23 20:55:20 +02:00
Xinchen Hui
f20118aa66 Avoid multipy allocating of request env 2015-05-24 01:07:36 +08:00
Anatol Belski
d5f695ce7b Merge branch 'PHP-5.6' 
* PHP-5.6:
  increase the internal post data buffer
 2015-05-23 18:47:26 +02:00
Anatol Belski
f3cec08e65 increase the internal post data buffer 
This brings speedup and fixes issues with var parsing. Default BUFSIZ
on Windows is 512 bytes which causes too much reallocation work.
 2015-05-23 18:44:39 +02:00
Xinchen Hui
86de98caba Use weak function for fcgi_log 2015-05-23 19:19:48 +08:00
Xinchen Hui
18cf4e0a8a Fixed fpm-side (tests passes) 2015-05-23 19:01:41 +08:00
Levi Morrison
e13803d15b Inline zend_find_builtin_type 
This function was used only inside of zend_find_builtin_type_by_name,
which is also used only one time.
 2015-05-23 11:12:13 +02:00
Levi Morrison
e22ceb6e82 Remove duplication 2015-05-23 11:12:13 +02:00
Levi Morrison
339283c523 Rename some variables and functions 
The way these are used have little to do with them being scalars;
they are just tuples with names, lengths and IS_* constants. We
will probably reuse these in the future with other types.
 2015-05-23 11:12:12 +02:00
Radu Brănișcan
0c7634fcc7 Corrected line comment 5256 
From the text "dectupt" to "decrypt"
 2015-05-23 11:11:58 +02:00
Nikita Popov
8542befa7b Remove ZEND_BRK/ZEND_CONT from VM 
These are no longer used at run-time now, only temporarily during
compilation.
 2015-05-23 10:51:33 +02:00
Nikita Popov
7a88d16cf3 Use ZEND_JMP instead of ZEND_BRK/ZEND_CONT 
Emit necessary FREEs during compilation, convert to JMP during
pass_two (we may not know target opline beforehand).
 2015-05-23 10:51:33 +02:00
Nikita Popov
9325ada725 Embed break/continue depth into opline 
Previously a separate lval literal was used - this is probably a
leftover from the time where the break level could still be
specified dynamically.
 2015-05-23 10:51:33 +02:00
Nikita Popov
3cbe3903fa Move loop var stack management into begin/end loop 
Also set start to -1 in begin_loop already, so the info that a
loop variable is not used is already available at compile-time.
 2015-05-23 10:51:33 +02:00
Nikita Popov
d0e265392f Drop FREE_ON_RETURN flag, check brk_cont->start instead 
Start >= 0 already tells us whether or not the loop has a loop
variable, no need to add extra flags to opcodes.

Also added a test for a case where FREE_ON_RETURN is relevant,
we didn't seem to have any coverage for this.
 2015-05-23 10:51:33 +02:00
Nikita Popov
1bee093eca Drop THIS_HASHVAL define 
No longer used
 2015-05-23 10:51:32 +02:00
Xinchen Hui
fef18f4bea Merge branch 'master' into merge-fastcgi 2015-05-23 10:29:45 +08:00
Anatol Belski
8d7003f708 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix test
  Add entry for bug #69354, fixed in 5.5.25
  Add CVE for bugs in 5.6.9
  Add entry about PCRE upgrade (rev 95fa7279)
  Add CVE for bugs in 5.5.25

Conflicts:
	ext/phar/tests/bug69441.phpt
 2015-05-22 21:32:40 +02:00
Anatol Belski
0bc3a74334 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix test
 2015-05-22 21:27:19 +02:00
Anatol Belski
d9c266f4c9 fix test 
Sometimes the path is unixified, sometimes not, so better don't
care about the slash in this case.
 2015-05-22 21:25:52 +02:00
Lior Kaplan
2e2cbcc926 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Add entry for bug #69354, fixed in 5.5.25
  Add entry about PCRE upgrade (rev 95fa7279)
  Add CVE for bugs in 5.5.25
 2015-05-22 11:18:32 +03:00
Lior Kaplan
827d2c1415 Add entry for bug #69354, fixed in 5.5.25 2015-05-22 11:17:01 +03:00
Lior Kaplan
f736934af0 Add CVE for bugs in 5.6.9 2015-05-22 11:15:36 +03:00
Lior Kaplan
7ecab5d23f Add entry about PCRE upgrade (rev 95fa7279) 2015-05-22 11:02:01 +03:00
Lior Kaplan
c9ac441fe8 Add CVE for bugs in 5.5.25 2015-05-22 10:58:28 +03:00
Xinchen Hui
50688e3984 Forgot the test for bug #69688 2015-05-22 11:50:55 +08:00
Xinchen Hui
95da6b76f3 Fixed test 2015-05-22 11:49:15 +08:00
Xinchen Hui
8c0ba65d6a Fixed bug #69688 (segfault with eval and opcache fast shutdown) 2015-05-22 11:48:13 +08:00
Anthony Ferrara
ed4052f1d5 Fixed bug #69686 password_verify reports back error on PHP7 will null string. 
The deprecation of DES salts created a warning when trying to verify them with password_hash. This bug fix adds a quiet mode to php_crypt() which is used by password_verify.
 2015-05-21 17:12:51 -04:00
Nikita Popov
3dba00bc31 Fix scope_is_known() for class constants 
Here the active_op_array is still the surrounding file, but we
do know the scope.
 2015-05-21 21:07:05 +02:00
Dmitry Stogov
f186d4b8b1 Fixed build with DEBUG_COMPACT_LITERALS=1 2015-05-21 17:57:06 +03:00
Dmitry Stogov
58c484a0bb Fixed typo in ZEND_GCC_GLOBAL_REGS configure test (Albert) 2015-05-21 16:34:59 +03:00
Peter Cowburn
474e4220ef removed old news item 
This change was introduced in PHP 5.5.21 and 5.6.5
 2015-05-21 13:17:27 +01:00
Remi Collet
aec039cc6e Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  Fixed bug #69680 (phar symlink in binary directory broken).
  Make the phar symlink relative
 2015-05-21 14:07:14 +02:00
Remi Collet
68e368ed34 NEWS 2015-05-21 14:07:02 +02:00
Remi Collet
17d5ebe76e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #69680 (phar symlink in binary directory broken).
  Make the phar symlink relative
 2015-05-21 14:06:26 +02:00
Remi Collet
a7de68f98a Fixed bug #69680 (phar symlink in binary directory broken). 
Relative symlink are better, as relative to link directory.
 2015-05-21 14:05:15 +02:00
ponce
c3d983f3af Make the phar symlink relative 
or we got a symlink pointing to the build files
thanks also to remicollet
 2015-05-21 14:03:18 +02:00
Anatol Belski
5acddf898f Merge branch 'PHP-5.6' 
* PHP-5.6:
  remove duplicated declaration, fix build
 2015-05-21 10:57:30 +02:00
Anatol Belski
4fe938b0a9 remove duplicated declaration, fix build 2015-05-21 10:56:14 +02:00
Anatol Belski
928e9e980b Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  updated NEWS
  added missing GLOB_BRACE support check
  added SKIPIF section to test to make sure that GLOB_BRACE is supported
  fix #69628: complex GLOB_BRACE fails on Windows
  added PHPT to check for bug #69628
 2015-05-21 09:49:18 +02:00
Anatol Belski
e85653051a updated NEWS 2015-05-21 09:47:59 +02:00