clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 02:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
90,184 Commits 491 Branches 1,363 Tags 841 MiB
8542befa7b
Commit Graph

90184 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julien Pauli
c09fad97d6 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Close fd at the end, otherwise people complain
  Add file descriptor caching to mcrypt_create_iv()
 2015-05-13 14:19:04 +02:00
Leigh
f7952b90ca Close fd at the end, otherwise people complain 
Even though it's closed when the process terminates!
 2015-05-13 14:18:32 +02:00
Leigh
c02c4aca00 Add file descriptor caching to mcrypt_create_iv() 
This improves performance for applications that make repeated calls to
mcrypt_create_iv()
 2015-05-13 14:18:32 +02:00
Julien Pauli
4f5ab6fca4 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Updated NEWS
 2015-05-13 13:06:19 +02:00
Julien Pauli
1b12982d39 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Updated NEWS
 2015-05-13 13:06:08 +02:00
Julien Pauli
43c24da166 Updated NEWS 2015-05-13 13:05:46 +02:00
Dmitry Stogov
d72a94468e Merged FE_FETCH_R[W] with the following ASSIGN[_REF] when assigne to CV. 2015-05-13 12:55:42 +03:00
Anatol Belski
6254184a4d ups, it should have used Zend MM 2015-05-13 11:11:37 +02:00
Dmitry Stogov
0d3a24c3f7 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  fix build, catch up with linux part for #66048
 2015-05-13 10:10:14 +03:00
Dmitry Stogov
7e5aa6b2ea Removed deprecated conditions 2015-05-13 10:09:06 +03:00
Anatol Belski
890d482197 fix build, catch up with linux part for #66048 2015-05-13 09:05:58 +02:00
Dmitry Stogov
f69b30eaae Partial revert of 6a819bba40. 2015-05-13 09:43:05 +03:00
Stanislav Malyshev
5a1bef8eef Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix format
  update NEWS
  Add test for bug #69522
  Update tests
  Fix bug #69522 - do not allow int overflow
  Forgot test file
  Fix bug #69403 and other int overflows
  Fixed bug #69418 - more s->p fixes for filenames
  Fixed bug #69364 - use smart_str to assemble strings
  Fix bug #69453 - don't try to cut empty string
  Fix bug #69545 - avoid overflow when reading list

Conflicts:
	Zend/zend_alloc.c
	Zend/zend_operators.c
	ext/ftp/ftp.c
	ext/pcntl/pcntl.c
	ext/standard/basic_functions.c
	ext/standard/dir.c
	ext/standard/file.c
	ext/standard/pack.c
	ext/standard/string.c
	main/rfc1867.c
 2015-05-12 15:00:24 -07:00
Stanislav Malyshev
587ddf6ddc Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix format
  update NEWS
  Add test for bug #69522
  Update tests
  Fix bug #69522 - do not allow int overflow
  Forgot test file
  Fix bug #69403 and other int overflows
  Fixed bug #69418 - more s->p fixes for filenames
  Fixed bug #69364 - use smart_str to assemble strings
  Fix bug #69453 - don't try to cut empty string
  Fix bug #69545 - avoid overflow when reading list

Conflicts:
	ext/standard/pack.c
 2015-05-12 14:26:06 -07:00
Stanislav Malyshev
c08f9c2c78 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix format
  update NEWS
  Add test for bug #69522
  Update tests
  Fix bug #69522 - do not allow int overflow
  Forgot test file
  Fix bug #69403 and other int overflows
  Fixed bug #69418 - more s->p fixes for filenames
  Fixed bug #69364 - use smart_str to assemble strings
  Fix bug #69453 - don't try to cut empty string
  Fix bug #69545 - avoid overflow when reading list

Conflicts:
	ext/pcntl/pcntl.c
	ext/standard/basic_functions.c
	ext/standard/pack.c
	ext/standard/tests/dir/opendir_variation1-win32.phpt
 2015-05-12 14:24:15 -07:00
Stanislav Malyshev
f473ea5464 fix format 2015-05-12 12:37:28 -07:00
Stanislav Malyshev
2f83797a0c update NEWS 2015-05-12 12:17:54 -07:00
Julien Pauli
468e37fe02 fix #66048 for PHP7 
* fix-66048:
  Fix for #66048
 2015-05-12 16:15:10 +02:00
Julien Pauli
6a819bba40 Fix for #66048 2015-05-12 16:15:01 +02:00
Julien Pauli
ff66eec482 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Updated NEWS
  Fix for #66048
 2015-05-12 16:14:07 +02:00
Julien Pauli
adbb301a70 Updated NEWS 2015-05-12 16:13:39 +02:00
Julien Pauli
2ddb560c2e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix for #66048
 2015-05-12 16:12:51 +02:00
Julien Pauli
c117548ea9 Fix for #66048 2015-05-12 16:12:29 +02:00
Nikita Popov
c6b986b4e7 Merge branch 'PHP-5.6' 
Conflicts:
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
 2015-05-12 15:09:25 +02:00
Nikita Popov
e1cb22a23e Fix bug #69599 2015-05-12 15:08:12 +02:00
Dmitry Stogov
0586702d32 Mark first call frames of stack segment with ZEND_CALL_ALLOCATED flag to simplify checks on stack deallocation. 2015-05-12 15:56:42 +03:00
Julien Pauli
653e8c58c8 Updated NEWS 2015-05-12 14:34:14 +02:00
Christoph M. Becker
c3c87e4996 return FALSE instead of NULL from ZipArchive::getStream when php_stream_zip_open() fails (fixes #67161) 2015-05-12 14:32:05 +02:00
Adil Ilhan
c9c2794fe6 HTTP 506 status code added. 
HTTP 506 status code added in main http status codes file. Reference: RFC 2295
 2015-05-12 14:08:17 +02:00
Matthias Breddin
3b6381125c Update www.conf.in 2015-05-12 13:52:49 +02:00
Matthias Breddin
6bd4c3e17d Detailed information about the strftime access.log format 
More descriptive usage of a custom timeformat
 2015-05-12 13:52:49 +02:00
Julien Pauli
0f422fc467 Updated NEWS 2015-05-12 13:36:13 +02:00
Aaron Piotrowski
071111ecfc Add support for $callable() sytnax with 'Class::method' 
Using the $callable() syntax when used with a string of
the form 'Class::method' would error as an undefined
function, even if the string passed is_callable() or the
callable type-hint. The fix adds support for the $callable()
syntax for any string accepted by is_callable() or the
callable type-hint.

Fix bug 68475 test with deprecated notice

Reduced scope of unit test.

Added tests with arguments.
 2015-05-12 13:33:28 +02:00
Julien Pauli
f4d6596283 Reworked NEWS for PHP 7 2015-05-12 13:29:29 +02:00
Dmitry Stogov
06ef3aa6b0 Fixed string handling (string cached in SHM marked as permanent, strings stored in CG(arena) as not) 
Fixed anonymous class support
 2015-05-12 13:45:52 +03:00
Xinchen Hui
3c027e1e4e Merge branch 'phpize-zts-display' of https://github.com/monque/php-src 2015-05-12 17:42:23 +08:00
Yuchen Wang
2bd097c9f6 Fix wrong display in ZTS checking 2015-05-12 17:32:01 +08:00
Julien Pauli
79fc9662a3 Updated NEWS 2015-05-12 11:29:47 +02:00
Mats Lindh
7a57061a1f Add comment about SEARCH HTTP Verb being possible as well 2015-05-12 11:24:27 +02:00
Mats Lindh
b6018144cd Add test for the SEARCH HTTP verb in the CLI HTTP server. 2015-05-12 11:24:27 +02:00
Mats Lindh
98d015c5b7 Add "SEARCH" as supported HTTP verb. 
The "SEARCH" HTTP request method is described in RFC5323 as part of
WebDAV, and allows a client to initiate a server side search.
 2015-05-12 11:24:27 +02:00
Julien Pauli
7ff82e2020 Updated UPGRADING 2015-05-12 11:20:12 +02:00
Julien Pauli
0b22cf04e3 Fixed tests 2015-05-12 11:18:35 +02:00
Stanislav Malyshev
ef8bb69a14 Ban rebinding closures to different internal classes 2015-05-12 10:54:59 +02:00
Julien Pauli
649b82ce4c Updated UPGRADING 2015-05-12 10:47:35 +02:00
Christoph M. Becker
613f747579 prohibit empty cookie names for setcookie() 2015-05-12 10:47:35 +02:00
Xinchen Hui
1b9a88ed1c Merge branch 'fpm-trace' of https://github.com/laruence/php-src 2015-05-12 16:38:40 +08:00
Xinchen Hui
16265a59ac Use explicit type here 2015-05-12 16:35:57 +08:00
Andreas Heigl
983b101f8e Implements extended error messages 
This commit introduces a new constant that can be used to retrieve more
detailed error messages.

This fixes #47222

The new constant LDAP_OPT_DIAGNOSTIC_MESSAGE is defined in PHP when the
underlying library provides (and understands) it. This is the case in
the current OpenLDAP-implementation.

Tanks to Johnny Willer who provided the solution at http://stackoverflow.com/questions/28765077/get-number-of-ad-errors-with-ldap-and-php-ldap-function-return-unprecise-error/28816473#28816473
 2015-05-12 10:06:54 +02:00
Loïck Piera
5cf78b81ea Fix typo in INSTALL 2015-05-12 09:58:08 +02:00