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
77,863 Commits 494 Branches 1,367 Tags 801 MiB
43cfa7f12a
Commit Graph

77863 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitry Stogov
1e161a9c0f Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Revered func_get_args() changes, because they were not completly transparent and broke some tricky PHP code that worked because of luck before php-5.5.6 (see Bug #66107). The changes are going to be kept in PHP-5.6.
 2013-12-10 16:08:46 +04:00
Dmitry Stogov
a46f644b3a Revered func_get_args() changes, because they were not completly transparent and broke some tricky PHP code that worked because of luck before php-5.5.6 (see Bug #66107). The changes are going to be kept in PHP-5.6. 2013-12-10 16:02:59 +04:00
Dmitry Stogov
4c3492b050 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 
* 'PHP-5.6' of git.php.net:php-src:
  Zend: fix overflow handling bug in non-x86 fast_add_function()
 2013-12-10 15:16:30 +04:00
Dmitry Stogov
49d7e98025 Fixed memory leaks introdused by: 
commit 611da37617
	Author: Igor Wiedler <igor@wiedler.ch>
	Date:   Sat Nov 9 13:48:23 2013 -0500
 2013-12-10 15:13:53 +04:00
Ard Biesheuvel
60d2e70c06 Zend: fix overflow handling bug in non-x86 fast_add_function() 
The 'result' argument of fast_add_function() may alias with either
of its operands (or both). Take care not to write to 'result' before
reading op1 and op2.
 2013-12-10 12:12:14 +01:00
Dmitry Stogov
5a87b7ff39 Fixed bug #66252 (Problems in AST evaluation invalidating valid parent:: reference. Constant expessions have to be evaluated in context of defining class). 2013-12-10 14:19:17 +04:00
Dmitry Stogov
5ad1117419 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Arguments passed to user function have to be properly allocated on heap
 2013-12-10 13:03:09 +04:00
Dmitry Stogov
a6516653b7 Arguments passed to user function have to be properly allocated on heap 2013-12-10 13:00:45 +04:00
Ard Biesheuvel
f33265d572 cli: don't cast away const in select() timeout argument 
The timeout argument to select() is modified to reflect the time
remaining when the function returns on a non-timeout condition.
Passing a pointer to const data and casting away the const-ness is
asking for trouble, but for some reason, this trouble manifests
itself only on non-x86 architectures [whose implementation of select()
in glibc is different from the one supplied for x86]

Fix this by passing a stack copy of the timeout argument to select()
 2013-12-09 16:54:42 +01:00
Stanislav Malyshev
cfd5ea4301 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Replace invalid code with a proper #error
 2013-12-08 15:53:41 -08:00
Stanislav Malyshev
744f35d2ab Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Replace invalid code with a proper #error
 2013-12-08 15:52:56 -08:00
Lior Kaplan
c062c18d42 Replace invalid code with a proper #error 
This code creates a nasty error as mentioned in bugs #31131, #37062
Patch taken from Debian's PHP package: 044-strtod_arm_fix
 2013-12-08 15:49:22 -08:00
Adam Harvey
d7a45a67be Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Switch to using freetype-config for freetype detection.
 2013-12-07 19:41:23 -08:00
Adam Harvey
a0955f351c Switch to using freetype-config for freetype detection. 
This fixes GD compilation against libfreetype 2.5.1 and later after they made
the rather interesting decision to change their include directory layout in a
point release.

The original suggestion in the bug was to use pkg-config, but my inclination is
to use freetype-config instead: we should be able to get the same configuration
information without actually needing pkg-config installed, since pkg-config is
by no means guaranteed to exist on many Unices and distros, whereas
freetype-config should always be present if a libfreetype build environment is
installed. Let's try it out and see what happens.

Fixes bug #64405 (Use freetype-config for determining freetype2 dir(s)).
 2013-12-07 19:39:40 -08:00
Bob Weinand
9cd9356523 Added mapping... 2013-12-07 20:28:23 +01:00
Felipe Pena
4715988c70 Merge branch 'opline_num_support' of github.com:krakjoe/phpdbg into opline_num_support 2013-12-07 16:20:37 -02:00
Felipe Pena
d2ded767c6 - CS 2013-12-07 16:18:44 -02:00
Bob Weinand
2555fbfc4e Renumbered phpdbg.h correctly 2013-12-07 16:03:01 +01:00
Bob Weinand
422f80e87d Merge branch 'master' of https://github.com/krakjoe/phpdbg into opline_num_support 
Conflicts:
	phpdbg.c
	phpdbg_bp.c
 2013-12-07 15:42:17 +01:00
Bob Weinand
50db4919ce Adapted opline_num breakpoints to master branch 2013-12-07 15:35:35 +01:00
Felipe Pena
793f1d7c4a - Fix compiler warning + ws 2013-12-07 12:31:10 -02:00
Felipe Pena
6e85e711de - Fix compiler warning 2013-12-07 12:17:29 -02:00
Phil Sturgeon
39cb92da16 Update README.md 2013-12-06 17:04:49 -05:00
Phil Sturgeon
6085597984 Added libedit reference to README 2013-12-06 16:57:52 -05:00
Phil Sturgeon
9cd5d75f4c Provide commands for getting started 2013-12-06 16:44:24 -05:00
krakjoe
8939d0da49 make simple 2013-12-06 21:04:20 +00:00
krakjoe
faf1013681 more tests 
add phpdbg_exec userland function
 2013-12-06 20:56:16 +00:00
krakjoe
ad2ea99c3e fix registered commands during init, add test 2013-12-06 20:18:44 +00:00
Ferenc Kovacs
9feb87b017 Merge branch 'igorw-use-function' into PHP-5.6 2013-12-06 11:06:41 +01:00
Michael Wallner
1135f3a042 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  BFN
 2013-12-06 10:39:10 +01:00
Michael Wallner
51f01a43a7 BFN 2013-12-06 10:39:02 +01:00
Michael Wallner
9ea2489f5c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #61645 (fopen and O_NONBLOCK)
  fix possibly uninitialized value
 2013-12-06 10:33:47 +01:00
Michael Wallner
a48d82d238 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #61645 (fopen and O_NONBLOCK)
  fix possibly uninitialized value
 2013-12-06 10:33:10 +01:00
Michael Wallner
b5f5bff965 Fixed bug #61645 (fopen and O_NONBLOCK) 
if a mode like "rn" was passed to fopen(), then
php_stream_parse_fopen_modes() would assign O_WRONLY to
flags, because O_NONBLOCK tainted flags for the r/w/+ check
 2013-12-06 10:29:24 +01:00
Michael Wallner
098d2a5d0f fix possibly uninitialized value 2013-12-06 10:27:33 +01:00
Ferenc Kovacs
562fa252ad Merge branch 'use-function' of git://github.com/igorw/php-src into igorw-use-function 2013-12-06 05:39:49 +01:00
krakjoe
4562eb0bc8 doh, I'm tired 2013-12-05 23:41:20 +00:00
krakjoe
9dcdca8cc6 travis build status image 2013-12-05 23:28:42 +00:00
krakjoe
3750cea9e1 use current build of php 2013-12-05 23:12:02 +00:00
krakjoe
78a0a2ad76 travis 2013-12-05 22:59:34 +00:00
krakjoe
ee5393ebf9 ... 2013-12-05 22:56:20 +00:00
krakjoe
c4c9119a35 remove code directory 2013-12-05 22:53:03 +00:00
krakjoe
6817683027 cleanup 2013-12-05 22:50:26 +00:00
krakjoe
3108b28dc1 add format tests 2013-12-05 22:43:14 +00:00
krakjoe
35bf233550 ... 2013-12-05 15:46:40 +00:00
krakjoe
e4e764c1e6 ... 2013-12-05 12:29:17 +00:00
krakjoe
39d74a2edc printing test 2013-12-05 12:27:47 +00:00
krakjoe
6fc2ed61c4 add moar 2013-12-05 12:23:49 +00:00
krakjoe
ef33b77897 change default options for tests 2013-12-05 12:06:35 +00:00
krakjoe
8c499c072d organize 2013-12-05 11:43:27 +00:00