Pierre Joye
22aeb976e0
- add todo for threshold
2013-02-28 19:34:14 +01:00
Pierre Joye
0c32a18d4c
- clean and enable threshold
2013-02-28 19:22:06 +01:00
Pierre Joye
a991360344
- add image crop support
2013-02-28 17:24:23 +01:00
Pierre Joye
82765a0780
- typo
2013-02-27 21:02:47 +01:00
Pierre Joye
74983a45cc
- fix name for imageflip constants, consistent witht the other
2013-02-27 20:23:31 +01:00
Pierre Joye
03d0bf633d
- add test
2013-02-27 20:22:45 +01:00
Pierre Joye
34adce6c47
- add constants for imageflip
2013-02-27 20:08:26 +01:00
Pierre Joye
efffdb4d7f
- add only once
2013-02-27 16:03:17 +01:00
Pierre Joye
98e43de7c5
- add new file for m4 as well
2013-02-27 16:02:54 +01:00
Pierre Joye
fa940a60de
- add image flip API support
2013-02-27 10:39:25 +01:00
Pierre Joye
e6414140e6
- add image flip API support
2013-02-27 10:39:16 +01:00
Pierre Joye
af5bf879aa
- add image flip API support
2013-02-27 10:39:09 +01:00
Pierre Joye
6a3623e199
- add image flip API support
2013-02-27 10:38:33 +01:00
Pierre Joye
246de922e6
- add image flip API support
2013-02-27 10:37:48 +01:00
Stanislav Malyshev
207d0ee08a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Bug #52861 : unset fails with ArrayObject and deep arrays
2013-02-26 22:13:01 -08:00
Stanislav Malyshev
7c08232509
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Bug #52861 : unset fails with ArrayObject and deep arrays
2013-02-26 22:12:36 -08:00
Mike Willbanks
61099f8585
Bug #52861 : unset fails with ArrayObject and deep arrays
...
When checking to make into a reference write, readwrite are checked but not unset
2013-02-26 22:11:52 -08:00
Xinchen Hui
e75804c34e
Merge branch 'PHP-5.4' into PHP-5.5
2013-02-24 12:59:10 +08:00
Xinchen Hui
d24ac6953e
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
ext/spl/spl_fixedarray.c
2013-02-24 12:58:39 +08:00
Xinchen Hui
1b58bd39a6
Fixed bug #64264 (SPLFixedArray toArray problem)
2013-02-24 12:55:53 +08:00
Gustavo Lopes
59ec22b370
sendrecvmsg_shutdown function moved to mshutdown
...
The function php_socket_sendrecvmsg_shutdown() should have been called in
MSHUTDOWN, not RSHUTDOWN.
Bug only on TSRM builds.
Should fix bug #64287 .
2013-02-24 03:50:38 +01:00
Gustavo Lopes
189fbfd53b
Fix ext/sockets build with phpize
...
Fixes bug #64285
2013-02-24 00:49:25 +01:00
Gustavo Lopes
97f22702c4
Fix ext/intl build with phpize
...
Fixes bug #64284 .
2013-02-24 00:49:01 +01:00
Andrey Hristov
64a2a8a753
relax the check
2013-02-22 13:50:04 +01:00
Andrey Hristov
1643d4ed56
Add some parameter checks
2013-02-22 13:17:46 +01:00
Johannes Schlüter
b479c2bffb
Merge branch 'PHP-5.4' into PHP-5.5
2013-02-21 16:50:59 +01:00
Johannes Schlüter
064c62e4cf
Fix #60840 (undefined symbol: mysqlnd_debug_std_no_trace_funcs)
2013-02-21 16:49:28 +01:00
Johannes Schlüter
7b719235b3
Merge branch 'PHP-5.4' into PHP-5.5
2013-02-21 15:10:47 +01:00
Johannes Schlüter
1e9bc56775
Merge branch 'PHP-5.3' into PHP-5.4
2013-02-21 15:10:15 +01:00
Johannes Schlüter
fcd4b5335a
Fix TSRM (after afc1debb
)
2013-02-21 15:08:58 +01:00
Dmitry Stogov
8b7222e22f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
PHAR should modify entry timestamp when it's modified
2013-02-21 16:08:07 +04:00
Dmitry Stogov
b5d267aa95
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
PHAR should modify entry timestamp when it's modified
2013-02-21 15:57:26 +04:00
Dmitry Stogov
7b113d789d
PHAR should modify entry timestamp when it's modified
2013-02-21 15:55:20 +04:00
Sara Golemon
ead2e1708d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
http-stream test requires network connectivity
2013-02-21 03:22:09 -08:00
Sara Golemon
c16d6befd4
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
http-stream test requires network connectivity
2013-02-21 03:21:49 -08:00
Sara Golemon
bc55a8eb9f
http-stream test requires network connectivity
2013-02-21 03:21:23 -08:00
Stanislav Malyshev
d39554ac08
Merge branch 'bug49348' into PHP-5.5
...
* bug49348:
fix tests
fix bug #49348 - issue notice on get_property_ptr_ptr when used for read
2013-02-21 00:52:46 -08:00
Dmitry Stogov
20c623c9be
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed external entity loading
2013-02-20 22:30:59 +04:00
Dmitry Stogov
c737b89473
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed external entity loading
Conflicts:
ext/libxml/libxml.c
ext/libxml/php_libxml.h
2013-02-20 22:27:41 +04:00
Dmitry Stogov
8e76d0404b
Fixed external entity loading
2013-02-20 22:14:59 +04:00
Anatol Belski
43664e656d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix the test for curl 7.29.0+
2013-02-19 09:05:27 +01:00
Anatol Belski
cc34dfce16
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
fix the test for curl 7.29.0+
2013-02-19 09:04:52 +01:00
Anatol Belski
558c5dbe65
fix the test for curl 7.29.0+
2013-02-19 09:04:06 +01:00
Stanislav Malyshev
0c6d903ce7
fix bug #49348 - issue notice on get_property_ptr_ptr when used for read
2013-02-18 20:56:02 -08:00
Gustavo Lopes
91538e4e13
Cleanup some multicast code; fix for mac os x?
...
When I moved some stuff from sockets.c to multicast.c, I did not copy
some conditional defines for systems without the RFC 3678 API.
I moved such defines to multicast.h so both sockets.c and multicast.c
can benefit from them and I prefixed them with PHP_ so that it's less
confusing: now PHP_MCAST_* are defined to either the MCAST_* RFC 3678
APIs or to legacy APIs and MCAST_* always mean the (possibly undefined)
system definitions.
2013-02-17 22:42:58 +01:00
Stanislav Malyshev
17c6389e9e
fix protos
2013-02-17 13:33:48 -08:00
Stanislav Malyshev
0841eca580
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix bug #61930 : openssl corrupts ssl key resource when using openssl_get_publickey()
2013-02-17 13:29:34 -08:00
Stanislav Malyshev
7b0107cc5d
fix bug #61930 : openssl corrupts ssl key resource when using openssl_get_publickey()
2013-02-17 13:28:42 -08:00
Anatol Belski
432d59ab55
fix free vs. curl_free
2013-02-17 20:29:20 +01:00
Xinchen Hui
d3291de51a
Merge branch 'PHP-5.4' into PHP-5.5
2013-02-17 11:06:33 +08:00
Xinchen Hui
263accb626
Merge branch 'PHP-5.3' into PHP-5.4
2013-02-17 11:05:34 +08:00
Xinchen Hui
01ae5c3c2f
Fixed bug #64228 (RecursiveDirectoryIterator always assumes SKIP_DOTS)
2013-02-17 11:04:36 +08:00
Xinchen Hui
69b80a93de
Merge branch 'PHP-5.4' into PHP-5.5
2013-02-16 22:29:14 +08:00
Xinchen Hui
375e3c273b
Fix test failed after 0ea83ff847
2013-02-16 22:28:28 +08:00
Dmitry Stogov
1bde2b4fc9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Proper bit reset code
2013-02-13 22:07:57 +04:00
Dmitry Stogov
4b900f4831
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Proper bit reset code
2013-02-13 22:07:21 +04:00
Dmitry Stogov
188c196d4d
Proper bit reset code
2013-02-13 22:06:37 +04:00
Andrey Hristov
5bfdf4f069
build fixes
2013-02-11 12:07:10 +01:00
Moriyoshi Koizumi
20eb33b321
mb_split() can now handle empty matches like preg_split() does.
2013-02-10 15:05:17 +09:00
Moriyoshi Koizumi
0ea83ff847
mb_split() can now handle empty matches like preg_split() does.
2013-02-10 15:04:23 +09:00
Andrey Hristov
a5b426eeff
update test case
2013-02-08 18:28:22 +01:00
Andrey Hristov
43ecd8fe1b
mysqli_savepoint()/mysqli_release_savepoint()
2013-02-08 18:09:50 +01:00
Andrey Hristov
0da369ae50
Add the constants needed for mysqli_commit(), _rollback() and
...
begin_transaction()
2013-02-08 17:05:25 +01:00
Andrey Hristov
666a835660
Add savepoint and rollback to savepoint support
2013-02-08 16:36:17 +01:00
Andrey Hristov
e1e22fd2e4
Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5
2013-02-07 20:35:30 +01:00
Andrey Hristov
afacdecd1f
Add support for begin_transaction in libmysql mode.
...
Add support for flags and name for commit/rollback in libmysql mode
2013-02-07 18:45:49 +01:00
Boris Lytochkin
92a7924c1a
Merge branch 'PHP-5.4' of https://git.php.net/push/php-src into PHP-5.4
2013-02-07 21:43:37 +04:00
Boris Lytochkin
e09211545c
Merge branch 'PHP-5.5' of https://git.php.net/push/php-src into PHP-5.5
2013-02-07 21:42:07 +04:00
Andrey Hristov
403d4fbbff
Export new calls
2013-02-07 18:29:19 +01:00
Andrey Hristov
49e3d91ad9
Add the name in a comment at commit/rollback, if provided
2013-02-07 16:24:08 +01:00
Andrey Hristov
9fb0dba4be
Add support for commit and rollback options.
...
Add support for explicitly starting a transaction - modes also available.
Using the API makes the life of load balancer mysqlnd plugins easier/possible.
2013-02-07 16:05:27 +01:00
Dmitry Stogov
0547a36e95
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Disabled external entities loading
2013-02-07 16:09:49 +04:00
Dmitry Stogov
1a18e84822
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Disabled external entities loading
2013-02-07 16:09:12 +04:00
Dmitry Stogov
afe98b7829
Disabled external entities loading
2013-02-07 16:07:05 +04:00
Boris Lytochkin
6c5c04888d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix bug #64124 (IPv6 malformed)
2013-02-07 14:49:45 +04:00
Boris Lytochkin
ed6763420c
fix bug #64124 (IPv6 malformed)
...
hostname returned from zend_parse_parameters() was modified in
netsnmp_session_init() that caused imput parameter modification along with
unpredictable changes when parameter is a constant sctring.
One typo in comment was fixed.
2013-02-07 14:48:28 +04:00
Dmitry Stogov
4730bc8680
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Check if soap.wsdl_cache_dir confirms to open_basedir
2013-02-07 13:12:01 +04:00
Dmitry Stogov
702b436ef4
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Check if soap.wsdl_cache_dir confirms to open_basedir
2013-02-07 13:10:04 +04:00
Dmitry Stogov
cc4c318b0c
Check if soap.wsdl_cache_dir confirms to open_basedir
2013-02-07 13:04:47 +04:00
Anatoliy Belsky
215da6057f
make libvpx optional
2013-02-06 16:22:27 +01:00
Andrey Hristov
c311884e5b
Merge branch 'PHP-5.4' into PHP-5.5
2013-02-04 14:28:23 +01:00
Andrey Hristov
740b823be8
check the validity of the parameter
2013-02-04 14:27:56 +01:00
Andrey Hristov
643ce95b5b
Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4
2013-02-04 14:15:58 +01:00
Andrey Hristov
cb8b2dd2e0
Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5
2013-02-04 14:15:29 +01:00
Xinchen Hui
53159f6e05
implicit declaration of zend_throw_exception
2013-02-04 14:20:50 +08:00
Felipe Pena
7369a68379
- Fixed ZTS build
2013-02-03 10:57:31 -02:00
Martin Jansen
6186b67600
Add option to specific the expected separator character.
2013-02-03 13:23:54 +01:00
Martin Jansen
0661d03eba
There is no need to use memchr() for comparisons in these places.
2013-02-03 13:23:53 +01:00
Martin Jansen
2f33443883
ext/filter support for validating MAC addresses.
2013-02-03 13:23:53 +01:00
Gustavo Lopes
8771c265a4
Fix test on Windows.
...
Windows complains of invalid parameters because the socket is not bound.
The test expected the error to be EAGAIN/EWOULDBLOCK. Moved the call down,
after the socket is bound.
2013-02-03 02:03:00 +01:00
Gustavo Lopes
af1b90d62b
Fix bug and hopefully build on WinSDK 6.1
...
There build was failing on rmtools on the sockets extension for two reasons:
1. IPV6_TCLASS and IPV6_RECVTCLASS not being defined. These are probably
recent additions to SDK. Windows 7 doesn't event seem to have complete
support for IPV6_TCLASS, not accepting in WSASendMsg(). The parts that
needed this constant were not guarded by #ifdefs. They are now.
2. The constants EWOULDBLOCK and EINPROGRESS not being defined. These
were only defined in php_network.h, outside of the extension, and not
all source files included this header. Nevertheless, a macro defined in
php_sockets.h needed these constants. When this macro was used in files
that did not include php_network.h, the compilation would fail.
Surprisingly, the build did not fail when using the 7.1 Windows SDK
(more likely, the CRT headers used in VC10), as somehow errno.h was
being included through some other standard header. This would make the
constant EWOULDBLOCK defined; however, it would be defined to the wrong
value. In the winsock context, WSAEWOULDBLOCK should be used instead.
Because we have difficulty using Windows-only constants in the code, we
(re)define EWOULDBLOCK to WSAEWOULDBLOCK. This has the obvious
disavantage we may miss problems like this again in the future.
2013-02-03 01:36:14 +01:00
Gustavo Lopes
03b1da5d7a
php_strerror in ext/sockets renamed in 5.5
2013-02-02 18:39:47 +01:00
Gustavo Lopes
0110662ae9
Move macro back to .c file
...
Because it depends on a static function on that .c file.
2013-02-02 18:32:38 +01:00
Gustavo Lopes
b11777ca2a
Merge branch 'sendrecvmsg_rebase_55' into PHP-5.5
...
* sendrecvmsg_rebase_55: (31 commits)
Fix multicast.c not defining errno on Windows
Fix non-Windows build
send/recvmsg() support for Windows
Remove some pre-vista code
Revert "Payload of HOPLIMIT/TCLASS are 8-bit"
Ensure memory is initialized
Payload of HOPLIMIT/TCLASS are 8-bit
Fix buf in string -> int conv.
Build fixes; accept names for if_index
Refactoring: move stuff to new conversions.c
Support sticky IPV6_PKTINFO
Rename some functions for consistency
Destroy ancillary registry on shutdown
Move some multicast stuff to multicast.c
Fix mcast_ipv6_send test
Check return of fstat()
Fix build on Mac OS X
Register extra MSG_* constants
Add test for CMSG_RIGHTS
Add test for CMSG_CREDENTIALS message
...
2013-02-02 16:50:38 +01:00
Gustavo Lopes
e2fc17c833
Fix multicast.c not defining errno on Windows
...
Small cleanups in includes as well.
2013-02-02 16:38:09 +01:00
Gustavo Lopes
608254fa57
Fix non-Windows build
2013-02-02 16:38:09 +01:00
Gustavo Lopes
7066cc7267
send/recvmsg() support for Windows
2013-02-02 16:38:09 +01:00
Gustavo Lopes
95f8d34f9c
Revert "Payload of HOPLIMIT/TCLASS are 8-bit"
...
This reverts commit 61a5ec7381ba5388a52926779fe3f58af0caea83.
I checked Linux and OpenBSD and both use integers to write the
IPV6_TCLASS messages and they don't force any endianness. This is
despite RFC 3542 explicitly saying the first byte of cmsg_data will
have the result. In any case, it doesn't make any difference in
little-endian archs.
2013-02-02 16:38:08 +01:00
Gustavo Lopes
5c0a8b1a2a
Ensure memory is initialized
2013-02-02 16:38:08 +01:00
Gustavo Lopes
f10baf14ed
Payload of HOPLIMIT/TCLASS are 8-bit
2013-02-02 16:38:08 +01:00
Gustavo Lopes
c846fcef68
Fix buf in string -> int conv.
2013-02-02 16:38:08 +01:00
Gustavo Lopes
bd580db373
Build fixes; accept names for if_index
2013-02-02 16:38:08 +01:00
Gustavo Lopes
4414b33abd
Refactoring: move stuff to new conversions.c
2013-02-02 16:38:08 +01:00
Gustavo Lopes
66ea024587
Support sticky IPV6_PKTINFO
2013-02-02 16:38:08 +01:00
Gustavo Lopes
b18bd8904e
Rename some functions for consistency
2013-02-02 16:38:07 +01:00
Gustavo Lopes
8fb1aa6184
Destroy ancillary registry on shutdown
2013-02-02 16:38:07 +01:00
Gustavo Lopes
51394f76a5
Move some multicast stuff to multicast.c
2013-02-02 16:38:07 +01:00
Gustavo Lopes
3e515a2fd9
Fix mcast_ipv6_send test
2013-02-02 16:38:07 +01:00
Gustavo Lopes
5bf7b08efd
Check return of fstat()
2013-02-02 16:38:07 +01:00
Gustavo Lopes
190a0ed713
Fix build on Mac OS X
...
By deactivating unsupported features on this OS.
2013-02-02 16:38:07 +01:00
Gustavo Lopes
51e65667f5
Register extra MSG_* constants
2013-02-02 16:38:06 +01:00
Gustavo Lopes
74cf40c2fd
Add test for CMSG_RIGHTS
2013-02-02 16:38:06 +01:00
Gustavo Lopes
7fc4671df9
Add test for CMSG_CREDENTIALS message
2013-02-02 16:38:06 +01:00
Gustavo Lopes
a85d7f28f6
Added support for AF_UNIX messages
...
Added constants: SCM_RIGHTS, SCM_CREDENTIALS and SO_PASSCRED.
The function socket_cmsg_space() was modified to support message types with
variable size. Its new signature is:
int socket_cmsg_space(int $level, int $type, int $n)
where $n is the number of repetable elements that the message is composed of.
2013-02-02 16:38:06 +01:00
Gustavo Lopes
131245474b
Redactor to expose socket_import_file_descriptor()
2013-02-02 16:38:06 +01:00
Gustavo Lopes
b3effa60c7
Improve imported socket family detection
...
Also added constant SO_FAMILY.
2013-02-02 16:38:06 +01:00
Gustavo Lopes
17540788ad
Added missing return statements
2013-02-02 16:38:06 +01:00
Gustavo Lopes
0f849fe2aa
Add test and slightly tweak another
2013-02-02 16:38:06 +01:00
Gustavo Lopes
73ab2385cb
Support for IPV6_HOPLIMIT and IPV6_TCLASS
2013-02-02 16:38:05 +01:00
Gustavo Lopes
b27c22d627
Fix bug in from_zval_write_control_array()
2013-02-02 16:38:05 +01:00
Gustavo Lopes
b06f00477c
Fix bug converting zval sockaddr
...
The bug ocurred when the family was not specified but was instead guessed.
2013-02-02 16:38:05 +01:00
Gustavo Lopes
806a6e6399
Add IPV6_UNICAST_HOPS option constant.
2013-02-02 16:38:05 +01:00
Gustavo Lopes
eb4b1f6d46
Add test for recvmsg()
2013-02-02 16:38:05 +01:00
Gustavo Lopes
5e51c85143
Wrap recvmsg() and sendmsg()
...
This introduces two new functions:
int socket_recvmsg(resource $socket, array &$msghdr, int $flags)
int socket_sendmsg(resource $socket, array $msghdr, int $flags)
The arrays representing struct msghdr follow the native counterpart
closely: structs are mapped to arrays, fields to array elements whose
key is the name of the field without the prefix (e.g. "name" instead
of "msg_name") and array are mapped to sequential numeric PHP arrays.
Right now the only type of ancillary data supported is fot the
level/type pair IPPROTO_IPV6/IPV6_PKTINFO.
I also refactored out the name resolution functions and made
sockets_strerror() a global function.
2013-02-02 16:38:05 +01:00
Gustavo Lopes
ac47448abb
Ignore warnings on EAGAIN/EWOULDBLOCK/EINPROGRESS
...
See bug #63570
2013-02-02 15:43:05 +01:00
Gustavo Lopes
e8f0e863ae
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix wrong blocking state being set
Fix tests (Windows)
Remove a Windows only warning
Move & improve PHP_SOCKET_ERROR def
Move some declarations to sockets.c
Fix overbroad skipif include
2013-02-02 15:32:03 +01:00
Gustavo Lopes
ac6342bbc0
Fix wrong blocking state being set
2013-02-02 15:29:18 +01:00
Gustavo Lopes
40663ede83
Fix tests (Windows)
2013-02-02 15:29:18 +01:00
Gustavo Lopes
9283b8aea4
Move & improve PHP_SOCKET_ERROR def
2013-02-02 15:29:11 +01:00
Gustavo Lopes
97d656fc82
Move some declarations to sockets.c
2013-02-02 14:06:23 +01:00
Gustavo Lopes
a100c25ea4
Fix overbroad skipif include
2013-02-02 14:06:23 +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
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
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
Stanislav Malyshev
15e76e6a98
forgot this file :(
2013-01-29 15:02:55 -08:00
Stanislav Malyshev
748b37654d
complete zts fix
2013-01-29 12:12:34 -08: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
Stanislav Malyshev
489073b501
Merge branch 'PHp-5.4' into PHP-5.5
...
* PHp-5.4:
Fix bug #62524 , only follow redirects in file streams for 3xx HTTP statuses
2013-01-29 00:28:50 -08:00
Stanislav Malyshev
5382e156f9
Fix bug #62524 , only follow redirects in file streams for 3xx HTTP statuses
2013-01-29 00:27:35 -08:00
Stanislav Malyshev
a9d013bb02
Implement fix for bug #46439 - add CURLFile class for safer uploads
2013-01-28 22:22:59 -08:00
Anatoliy Belsky
263a220997
allow for libpng 1.5.x
2013-01-28 13:23:31 +01:00
Gustavo Lopes
fc7b054c2d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #64023 (__toString() & SplFileInfo)
2013-01-23 13:24:50 +01:00
Andrey Hristov
95346c017c
fix valgrind warning
2013-01-22 16:48:39 +01:00
Gustavo Lopes
b8b3bb08b2
Merge branch 'bug64023' into PHP-5.4
...
* bug64023:
Fix bug #64023 (__toString() & SplFileInfo)
Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
2013-01-22 12:24:33 +01:00
Gustavo Lopes
aa0adce47d
Fix bug #64023 (__toString() & SplFileInfo)
...
Defining a __toString() method was having no effect when concatenating
the object. This was because the cast_object() handler would ignore
__toString().
Using echo() directly would actually use __toString(), but this was a
bug: the ECHO handler would try zend_std_cast_object_tostring() before
cast_object(), but cast_object() should have priority as
zend_std_cast_object_tostring() assumes an object with a
zend_class_entry.
2013-01-22 11:33:29 +01:00
Xinchen Hui
e6bde1f8f6
Fix test related to change for #bug64007 and also fix in newInstanceArgs
2013-01-22 16:58:40 +08:00
Xinchen Hui
85fae636d0
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
ext/standard/var_unserializer.c
2013-01-21 11:42:16 +08:00
Xinchen Hui
86c1a26169
Merge fix of #62836 to ?.re, and regenerate ?.c
2013-01-21 11:35:22 +08:00
Xinchen Hui
f7b99c481d
Fixed bug #64007 (There is an ability to create instance of Generator by hand).
...
Use get_constrctor instead of access of the ce->constructor directly
2013-01-19 17:01:57 +08:00
Gustavo Lopes
cd2b03d5ae
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS for bug #64011 . See 77ee200
Fix bug #64011 (get_html_translation_table())
Fix News
2013-01-18 12:12:25 +01:00
Gustavo Lopes
77ee200097
Fix bug #64011 (get_html_translation_table())
...
get_html_translation_table() with encoding ISO-8859-1 and HTMLENTITIES
was broken. Only entities for characters U+0000 to U+0040 were being
included in the result.
2013-01-18 12:10:27 +01:00
Xinchen Hui
4eae087296
Fixed bug #63988 (Two Date tests fail) only for PHP-5.5
2013-01-18 15:49:36 +08:00
Felipe Pena
2f7aafe992
- Fixed ZTS build
2013-01-15 19:59:23 -02:00
Anatoliy Belsky
18e160411e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed build
NEWS for bug #63893
Conflicts:
NEWS
2013-01-15 22:39:49 +01:00
Anatoliy Belsky
9498cf6194
fixed build
2013-01-15 22:36:29 +01:00
Jille Timmermans
dba22c0864
Dereferencing process-handles no longer waits on those processes.
...
Implements FR #46487
2013-01-15 21:50:35 +01:00
Gustavo Lopes
1bd193ed36
Merge remote-tracking branch 'remotes/cataphract/strtr_wu94_55' into PHP-5.5
...
* remotes/cataphract/strtr_wu94_55:
Fixed inconsequential bug in strtr()
UPGRADING.INTERNALS: document zend_qsort_r
Add zend_qsort_r & use it in strtr
NEWS for bug #63893
Remove _GNU_SOURCE, add local heap sort
The compiler can figure this out
Remove unused block
strtr() with 2nd param array - optimization
Refactoring, bugs & leaks
Optimize strtr w/ 2nd arg array
2013-01-15 21:45:22 +01:00
Gustavo Lopes
93e35137aa
Merge remote-tracking branch 'remotes/cataphract/strtr_wu94_54' into PHP-5.4
...
* remotes/cataphract/strtr_wu94_54:
Fixed inconsequential bug in strtr()
Remove _GNU_SOURCE, add local heap sort
The compiler can figure this out
Remove unused block
strtr() with 2nd param array - optimization
Refactoring, bugs & leaks
Optimize strtr w/ 2nd arg array
2013-01-15 21:05:21 +01:00
Gustavo Lopes
88b82ae54d
Merge branch 'strtr_wu94_54' into strtr_wu94_55
2013-01-15 17:26:24 +01:00
Gustavo Lopes
930ef9ddd6
Fixed inconsequential bug in strtr()
2013-01-15 17:25:59 +01:00
Andrey Hristov
5cfa916aad
revert change. now it doesn't compile again...someone should fix ext/date...
2013-01-15 12:20:58 +01:00
Andrey Hristov
acc24d1f9e
Use two dtors thus allow allocation based on the alloc model of the
...
connection.
2013-01-15 12:19:52 +01:00
Andrey Hristov
d377a266b2
plug a leak - forgot ot use the dtor already written
2013-01-15 11:32:44 +01:00
Andrey Hristov
22ba2b95ce
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
NEWS
2013-01-15 11:06:59 +01:00
Adam Harvey
83864b470b
Revert "Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa."
...
This reverts commit 0510701474
.
2013-01-15 17:37:21 +08:00
Adam Harvey
b1bf524140
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Revert "Update fputcsv() to escape all characters equally."
2013-01-15 17:35:34 +08:00
Adam Harvey
c077074c13
Revert "Update fputcsv() to escape all characters equally."
...
On second thoughts, while the behaviour _is_ broken, this isn't the right fix.
This reverts commit 9b5cb0e805
.
2013-01-15 17:33:54 +08:00
Andrey Hristov
dc495bbe95
Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5
2013-01-15 10:05:54 +01:00
Andrey Hristov
1ff4352263
Add support for connect attributes, as of MySQL 5.6
2013-01-15 10:04:59 +01:00
Lars Strojny
eb40f73ca0
Bug #62489 : dba_insert not working as expected
2013-01-15 09:30:44 +01:00
Adam Harvey
8bf937f9bf
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa.
2013-01-15 15:50:57 +08:00
Adam Harvey
0510701474
Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa.
2013-01-15 15:49:52 +08:00
Xinchen Hui
4fa5c1d22d
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-15 15:33:26 +08:00
Xinchen Hui
3bc7490370
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2013-01-15 15:32:42 +08:00
Xinchen Hui
4fcf4e0845
Fixed bug #57702 (Multi-row BLOB fetches)
2013-01-15 15:31:49 +08:00
Adam Harvey
ba32970710
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Update fputcsv() to escape all characters equally.
2013-01-15 15:26:25 +08:00
Adam Harvey
a4191b0aad
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Update fputcsv() to escape all characters equally.
2013-01-15 15:24:21 +08:00
Adam Harvey
9b5cb0e805
Update fputcsv() to escape all characters equally.
...
At present, backslashes have special case handling within fputcsv(): when one
is encountered within a field that's being escaped, escaping stops until the
next instance of the enclosure character is hit. This can result in malformed
CSV.
Fixes bug #43225 (fputcsv incorrectly handles cells ending in \ followed by ").
2013-01-15 15:17:45 +08:00
Lars Strojny
3ea2b73a30
Merge branch 'PHP-5.5' of git://github.com/php/php-src into PHP-5.5
2013-01-14 21:41:24 +01:00
Lars Strojny
c4de702d4e
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-14 21:36:28 +01:00