Skip to content

Fixed bug #50333 Improving multi-threaded scalability by using emalloc/efree/estrdup #500

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
php-pulls merged 39 commits into from
Nov 5, 2013
Merged

Fixed bug #50333 Improving multi-threaded scalability by using emalloc/efree/estrdup #500

Changes from 8 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
0d534d7
Add ldap_escape()
DaveRandom Sep 17, 2013
2ddefbd
Added support for TLSv1.1 and TLSv1.2
rdlowrey Oct 8, 2013
c092d28
Fix compiler warnings in openssl.c
bukka Oct 13, 2013
51b809e
Assume the free space is correct on Travis CI.
datibbaw Oct 9, 2013
bd666e2
Merge branch 'PHP-5.5'
m6w6 Oct 17, 2013
4628c9b
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into…
cjbj Oct 17, 2013
134caeb
Merge branch 'master' of https://git.php.net/repository/php-src
cjbj Oct 17, 2013
2aaa3d5
Added support for TLSv1.1 and TLSv1.2
rdlowrey Oct 8, 2013
5a7ca69
Merge branch 'PHP-5.5'
m6w6 Oct 17, 2013
ad0a85b
fix ws
m6w6 Oct 17, 2013
62be976
TLS news
m6w6 Oct 17, 2013
e6481e2
Merge branch 'PHP-5.5'
m6w6 Oct 17, 2013
8aaecef
Revert "Added support for TLSv1.1 and TLSv1.2"
m6w6 Oct 17, 2013
d89d46d
Revert "TLS news"
m6w6 Oct 17, 2013
dd3a4c3
Merge branch 'PHP-5.5'
m6w6 Oct 17, 2013
3f2fba4
Merge branch 'updated_tls_support' of https://github.com/rdlowrey/php…
m6w6 Oct 17, 2013
b95f9fa
previous revert killed that file
m6w6 Oct 17, 2013
66868c8
TLS news
m6w6 Oct 17, 2013
a4b4477
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into…
cjbj Oct 17, 2013
cefbf93
Merge branch 'master' of https://git.php.net/repository/php-src
cjbj Oct 17, 2013
c59d790
Prepare for OCI8 2.0.5 release
cjbj Oct 17, 2013
5e368b7
Add missing test to package.xml
cjbj Oct 17, 2013
6b90f23
fixed typo and few grammar mistakes
beyonddream Oct 18, 2013
4417421
Retruning SUCCESS/FAILURE instead of int
laruence Oct 18, 2013
db61685
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
laruence Oct 18, 2013
065bbeb
Merge branch 'PHP-5.5'
laruence Oct 18, 2013
d345ad2
Merge branch 'zend-documentation-fix' of https://github.com/AskDrCatc…
laruence Oct 18, 2013
f711c12
Merge branch 'ldap_escape-dev' of https://github.com/DaveRandom/php-src
m6w6 Oct 18, 2013
a03b132
fix compiler warnings and type usage
m6w6 Oct 18, 2013
c86862c
Merge branch 'openssl_compile_warning_fix' of https://github.com/bukk…
m6w6 Oct 18, 2013
e17de5e
Merge branch 'bug50333' of github.com:weltling/php-src into bug50333
weltling Oct 29, 2013
fc707a2
back to do_alloca(), reverted the wrong replacement
weltling Oct 30, 2013
abb962d
compact the code to preserve the error info after state freeing
weltling Oct 30, 2013
4d430ec
simplify the state free macros
weltling Oct 31, 2013
f1c2f8f
removed unnecessary call
weltling Oct 31, 2013
39e7dcc
back to do_alloca()
weltling Oct 31, 2013
6aedfac
virtual_cwd_activate() should be called only in one place
weltling Oct 31, 2013
9df78bf
reverted the previous commit, both calls are needed in TS mode
weltling Nov 1, 2013
699f07b
limit virtual_cwd_activate() duplicated call to ZTS only
weltling Nov 2, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ext/standard/tests/file/disk_free_space_basic.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ echo "\n Free Space after writing to a file\n";
$space2 = disk_free_space($file_path.$dir);
var_dump( $space2 );

if( $space1 > $space2 )
if(getenv('TRAVIS') === 'true' || $space1 > $space2 )
echo "\n Free Space Value Is Correct\n";
else
echo "\n Free Space Value Is Incorrect\n";
Expand Down