clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 23:36:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
72,965 Commits 494 Branches 1,367 Tags 809 MiB
b89c326578
Commit Graph

72965 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gustavo Lopes
a100c25ea4 Fix overbroad skipif include 2013-02-02 14:06:23 +01:00
Nikita Popov
114245c1b9 Fix bug #63830: Segfault on undefined function call in nested generator 
This also reverses the destruction order of the pushed arguments to
align with how it is done everywhere else.

I'm not exactly sure whether this is the right way to fix it, but it
seems to work fine.
 2013-02-01 19:53:04 +01:00
Remi Collet
2117b8edd1 NEWS 2013-02-01 19:27:10 +01:00
Remi Collet
5d3501c7d4 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #64128 buit-in web server is broken on ppc64.
 2013-02-01 19:26:11 +01:00
Remi Collet
0cea9e6843 Fixed bug #64128 buit-in web server is broken on ppc64. 
fdset management using bit operator is broken on non-x86 arch
and cause built-in server the enter an infinite loop of "select"
and never handle any request.
 2013-02-01 19:23:25 +01:00
Nikita Popov
3ee20e450f Fix segfault when cloning generator with properties 
Rule of thumb: Always implement the object clone handler rather
than the object storage clone handler. Actually I think we should
drop the latter. It's nearly never usable.
 2013-02-01 18:33:26 +01:00
Andrey Hristov
642cff08c1 Merge branch 'PHP-5.4' into PHP-5.5 2013-02-01 17:22:21 +01:00
Andrey Hristov
f45a85c386 add new charset, from MySQL 5.6 2013-02-01 17:21:50 +01:00
Anatoliy Belsky
ac18c318dc fix enchant compilation under vc11 2013-02-01 12:43:26 +01:00
Johannes Schlüter
9c821ec7a1 Merge branch 'PHP-5.4' into PHP-5.5 2013-02-01 12:32:00 +01:00
Johannes Schlüter
b09f5a4f56 Fix typo in error message 2013-02-01 12:31:07 +01:00
Remi Collet
4608341303 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Mark this test as requiring internet connecion.
 2013-01-31 14:39:42 +01:00
Remi Collet
9d75bf35e9 Mark this test as requiring internet connecion. 2013-01-31 14:38:39 +01:00
Remi Collet
4ad5c82016 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix failed test: sys_errlist[116] have changed on recent glibc (Fedora 18) old: Stale NFS file handle new: Stale file handle
 2013-01-31 14:25:43 +01:00
Remi Collet
f7362232f4 Fix failed test: sys_errlist[116] have changed on recent glibc (Fedora 18) 
old: Stale NFS file handle
new: Stale file handle
 2013-01-31 14:22:56 +01:00
Johannes Schlüter
6167f9dc8d Merge branch 'PHP-5.4' into PHP-5.5 2013-01-31 00:59:10 +01:00
Johannes Schlüter
9d6636364d Merge branch 'PHP-5.3' into PHP-5.4 
Conflicts:
	configure.in
	main/php_version.h
 2013-01-31 00:58:52 +01:00
Johannes Schlüter
a80fdc47b3 This will be PHP 5.3.23 2013-01-31 00:57:29 +01:00
Lars Strojny
6b48a86a17 Merge branch 'PHP-5.4' into PHP-5.5 2013-01-31 00:33:46 +01:00
Lars Strojny
836a2b1131 NEWS entry new OpenSSL option [doc] 2013-01-31 00:32:44 +01:00
Daniel Lowrey
4a01ddfb55 Added ssl context option, "disable_compression" 
The CRIME attack vector exploits TLS compression. This patch adds a stream context option
allowing servers to disable TLS compression for versions of OpenSSL >= 1.0.0 (which first
introduced the SSL_OP_NO_COMPRESSION option). A summary rundown of the CRIME attack can
be found at https://community.qualys.com/blogs/securitylabs/2012/09/14/crime-information-leakage-attack-against-ssltls

Thanks to @DaveRandom for pointing out the relevant section of code.
 2013-01-31 00:31:10 +01:00
Nikita Popov
8b972efe5f Fix potential segfault when finally in a generator is run during shutdown 
If a generator is destroyed in a finally block it will resume the generator to run that finally
block before freeing the generator. This was done in the object storage free handler.

Running user code in the free handler isn't safe though because the free handlers may be run
during request shutdown, already after several key components have been shut down.

This is avoided by doing the finally handling in the dtor handler. These handlers are run at the
start of the shutdown sequence.
 2013-01-30 23:52:02 +01:00
Nikita Popov
f540e086e2 Fixed bug #64106: Segfault on SplFixedArray[][x] = y when extended 2013-01-30 20:40:02 +01:00
Nikita Popov
bb4d11b405 Merge branch 'PHP-5.3' into PHP-5.4 2013-01-30 20:25:59 +01:00
Nikita Popov
321f4f18e5 Fixed bug #64106: Segfault on SplFixedArray[][x] = y when extended 2013-01-30 20:23:39 +01:00
Jelle Zijlstra
86b3643807 Fix build problem in C++11 2013-01-30 19:08:24 +01:00
Jelle Zijlstra
31468401b7 Fix build problem in C++11 2013-01-30 19:07:52 +01:00
Ferenc Kovacs
f0fe3d2dbe having xz makes it three. thanks Mike Ford for spotting it 2013-01-30 17:39:13 +01:00
Ferenc Kovacs
cbdf9ea34c now we have also an xz archive 2013-01-30 14:12:38 +01:00
Stanislav Malyshev
15e76e6a98 forgot this file :( 2013-01-29 15:02:55 -08:00
Stanislav Malyshev
26de5cc57f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  branched 5.4.12
  update NEWS

Conflicts:
	configure.in
	main/php_version.h
 2013-01-29 12:34:45 -08:00
Stanislav Malyshev
09b6e33b40 branched 5.4.12 2013-01-29 12:33:45 -08:00
Stanislav Malyshev
7a6e76fd2f update NEWS 2013-01-29 12:31:49 -08:00
Stanislav Malyshev
748b37654d complete zts fix 2013-01-29 12:12:34 -08:00
Johannes Schlüter
78d3e66f3a Merge branch 'PHP-5.4' into PHP-5.5 2013-01-29 19:50:14 +01:00
Johannes Schlüter
078b025a15 Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5 2013-01-29 19:50:00 +01:00
Johannes Schlüter
1433854681 Merge branch 'PHP-5.3' into PHP-5.4 2013-01-29 19:49:43 +01:00
Johannes Schlüter
264279439b Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4 2013-01-29 19:49:39 +01:00
Johannes Schlüter
ec53b60072 Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3 2013-01-29 19:49:13 +01:00
Johannes Schlüter
93fd9c704b Fix bug #64099 (Wrong TSRM usage in zend_register_class_alias) 2013-01-29 19:47:45 +01:00
Gustavo Lopes
3bedc8ec27 Fixed paramter count 2013-01-29 19:19:51 +01:00
Gustavo Lopes
9d1bdaa569 Make converter work on VS 2013-01-29 19:19:49 +01:00
Gustavo Lopes
1da67fc65e intl/converter in line w/ intl error handling 2013-01-29 19:06:15 +01:00
Gustavo Lopes
a721fe2b22 Fix zpp() call in intl/converter 2013-01-29 19:06:14 +01:00
Gustavo Lopes
ee6522bebf Write local err on intlcal_get_time_zone() failure 2013-01-29 19:06:14 +01:00
Gustavo Lopes
363fd6d6fb Improve ERROR.CONVENTIONS 2013-01-29 19:06:14 +01:00
Gustavo Lopes
b4ba46cb99 Fix arginfo of BreakIterator::getLocale 2013-01-29 19:06:14 +01:00
Gustavo Lopes
4badc0c071 intl: doc explaining error conventions 2013-01-29 19:06:14 +01:00
Sara Golemon
1faddd15d9 Add UConverter class (ICU's UConverter API) 
RFC at http://wiki.php.net/rfc/uconverter
 2013-01-29 19:05:14 +01:00
Felipe Pena
37c304b5db - Fixed ZTS build 2013-01-29 09:26:54 -02:00