]> granicus.if.org Git - php/log
php
12 years agoAdd savepoint and rollback to savepoint support
Andrey Hristov [Fri, 8 Feb 2013 15:36:17 +0000 (16:36 +0100)]
Add savepoint and rollback to savepoint support

12 years agoadd the news about recent commits
Andrey Hristov [Fri, 8 Feb 2013 10:12:54 +0000 (11:12 +0100)]
add the news about recent commits

12 years agoMerge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5
Andrey Hristov [Thu, 7 Feb 2013 19:35:30 +0000 (20:35 +0100)]
Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5

12 years agoAdd support for begin_transaction in libmysql mode.
Andrey Hristov [Thu, 7 Feb 2013 17:45:49 +0000 (18:45 +0100)]
Add support for begin_transaction in libmysql mode.
Add support for flags and name for commit/rollback in libmysql mode

12 years agoMerge branch 'PHP-5.5' of https://git.php.net/push/php-src into PHP-5.5
Boris Lytochkin [Thu, 7 Feb 2013 17:42:07 +0000 (21:42 +0400)]
Merge branch 'PHP-5.5' of https://git.php.net/push/php-src into PHP-5.5

12 years agoExport new calls
Andrey Hristov [Thu, 7 Feb 2013 17:29:19 +0000 (18:29 +0100)]
Export new calls

12 years agoForgot test script
Xinchen Hui [Thu, 7 Feb 2013 15:49:35 +0000 (23:49 +0800)]
Forgot test script

12 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Xinchen Hui [Thu, 7 Feb 2013 15:45:28 +0000 (23:45 +0800)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

12 years agoFixed bug #64135 (Exceptions from set_error_handler are not always propagated)
Xinchen Hui [Thu, 7 Feb 2013 15:44:46 +0000 (23:44 +0800)]
Fixed bug #64135 (Exceptions from set_error_handler are not always propagated)

12 years agoAdd the name in a comment at commit/rollback, if provided
Andrey Hristov [Thu, 7 Feb 2013 15:24:08 +0000 (16:24 +0100)]
Add the name in a comment at commit/rollback, if provided

12 years agoAdd support for commit and rollback options.
Andrey Hristov [Thu, 7 Feb 2013 15:05:27 +0000 (16:05 +0100)]
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.

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Dmitry Stogov [Thu, 7 Feb 2013 12:09:49 +0000 (16:09 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Disabled external entities loading

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Dmitry Stogov [Thu, 7 Feb 2013 12:09:12 +0000 (16:09 +0400)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Disabled external entities loading

12 years agoDisabled external entities loading
Dmitry Stogov [Thu, 7 Feb 2013 12:07:05 +0000 (16:07 +0400)]
Disabled external entities loading

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Boris Lytochkin [Thu, 7 Feb 2013 10:49:45 +0000 (14:49 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix bug #64124 (IPv6 malformed)

12 years agofix bug #64124 (IPv6 malformed)
Boris Lytochkin [Thu, 7 Feb 2013 10:48:28 +0000 (14:48 +0400)]
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.

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Dmitry Stogov [Thu, 7 Feb 2013 09:12:01 +0000 (13:12 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Check if soap.wsdl_cache_dir confirms to open_basedir

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Dmitry Stogov [Thu, 7 Feb 2013 09:10:04 +0000 (13:10 +0400)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Check if soap.wsdl_cache_dir confirms to open_basedir

12 years agoCheck if soap.wsdl_cache_dir confirms to open_basedir
Dmitry Stogov [Thu, 7 Feb 2013 09:04:47 +0000 (13:04 +0400)]
Check if soap.wsdl_cache_dir confirms to open_basedir

12 years agomake libvpx optional
Anatoliy Belsky [Wed, 6 Feb 2013 15:22:27 +0000 (16:22 +0100)]
make libvpx optional

12 years agorevert
Remi Collet [Tue, 5 Feb 2013 11:29:21 +0000 (12:29 +0100)]
revert

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Remi Collet [Tue, 5 Feb 2013 11:29:01 +0000 (12:29 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  revert

12 years agorevert
Remi Collet [Tue, 5 Feb 2013 11:28:47 +0000 (12:28 +0100)]
revert

12 years agoNEWS
Remi Collet [Mon, 4 Feb 2013 14:27:43 +0000 (15:27 +0100)]
NEWS

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Remi Collet [Mon, 4 Feb 2013 14:27:07 +0000 (15:27 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #64142 (dval to lval different behavior on ppc64)

12 years agoFixed bug #64142 (dval to lval different behavior on ppc64)
Remi Collet [Mon, 4 Feb 2013 14:19:32 +0000 (15:19 +0100)]
Fixed bug #64142 (dval to lval different behavior on ppc64)

On x86_64:
(long)(double)9223372036854775807+1 = -9223372036854775808
On ppc64
(long)(double)9223372036854775807-1 = 9223372036854775807

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Andrey Hristov [Mon, 4 Feb 2013 13:28:23 +0000 (14:28 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

12 years agocheck the validity of the parameter
Andrey Hristov [Mon, 4 Feb 2013 13:27:56 +0000 (14:27 +0100)]
check the validity of the parameter

12 years agoMerge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4
Andrey Hristov [Mon, 4 Feb 2013 13:15:58 +0000 (14:15 +0100)]
Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4

12 years agoMerge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5
Andrey Hristov [Mon, 4 Feb 2013 13:15:29 +0000 (14:15 +0100)]
Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5

12 years agoimplicit declaration of zend_throw_exception
Xinchen Hui [Mon, 4 Feb 2013 06:20:50 +0000 (14:20 +0800)]
implicit declaration of zend_throw_exception

12 years ago- Fixed ZTS build
Felipe Pena [Sun, 3 Feb 2013 12:57:31 +0000 (10:57 -0200)]
- Fixed ZTS build

12 years agoNews about FR #49180.
Martin Jansen [Sun, 3 Feb 2013 12:27:36 +0000 (13:27 +0100)]
News about FR #49180.

12 years agoAdd option to specific the expected separator character.
Martin Jansen [Sat, 5 Jan 2013 21:46:14 +0000 (22:46 +0100)]
Add option to specific the expected separator character.

12 years agoThere is no need to use memchr() for comparisons in these places.
Martin Jansen [Fri, 28 Dec 2012 14:20:19 +0000 (15:20 +0100)]
There is no need to use memchr() for comparisons in these places.

12 years agoext/filter support for validating MAC addresses.
Martin Jansen [Mon, 24 Dec 2012 13:14:24 +0000 (14:14 +0100)]
ext/filter support for validating MAC addresses.

12 years agoFix test on Windows.
Gustavo Lopes [Sun, 3 Feb 2013 01:00:48 +0000 (02:00 +0100)]
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.

12 years agoNEWS/UPGRADING for changes in sockets, intl
Gustavo Lopes [Sun, 3 Feb 2013 00:59:35 +0000 (01:59 +0100)]
NEWS/UPGRADING for changes in sockets, intl

12 years agoFix bug and hopefully build on WinSDK 6.1
Gustavo Lopes [Sun, 3 Feb 2013 00:22:44 +0000 (01:22 +0100)]
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.

12 years agoMerge branch 'PHP-5.4' into PHP-5.5 (strategy ours)
Gustavo Lopes [Sat, 2 Feb 2013 17:40:05 +0000 (18:40 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5 (strategy ours)

* PHP-5.4:
  Move macro back to .c file

12 years agophp_strerror in ext/sockets renamed in 5.5
Gustavo Lopes [Sat, 2 Feb 2013 17:39:47 +0000 (18:39 +0100)]
php_strerror in ext/sockets renamed in 5.5

12 years agoMove macro back to .c file
Gustavo Lopes [Sat, 2 Feb 2013 17:32:38 +0000 (18:32 +0100)]
Move macro back to .c file

Because it depends on a static function on that .c file.

12 years agoMerge branch 'sendrecvmsg_rebase_55' into PHP-5.5
Gustavo Lopes [Sat, 2 Feb 2013 15:40:25 +0000 (16:40 +0100)]
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
  ...

12 years agoFix multicast.c not defining errno on Windows
Gustavo Lopes [Thu, 31 Jan 2013 15:34:46 +0000 (16:34 +0100)]
Fix multicast.c not defining errno on Windows

Small cleanups in includes as well.

12 years agoFix non-Windows build
Gustavo Lopes [Thu, 31 Jan 2013 15:24:02 +0000 (16:24 +0100)]
Fix non-Windows build

12 years agosend/recvmsg() support for Windows
Gustavo Lopes [Thu, 31 Jan 2013 13:01:31 +0000 (14:01 +0100)]
send/recvmsg() support for Windows

12 years agoRemove some pre-vista code
Gustavo Lopes [Wed, 30 Jan 2013 20:40:45 +0000 (21:40 +0100)]
Remove some pre-vista code

12 years agoRevert "Payload of HOPLIMIT/TCLASS are 8-bit"
Gustavo Lopes [Thu, 31 Jan 2013 14:26:10 +0000 (15:26 +0100)]
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.

12 years agoEnsure memory is initialized
Gustavo Lopes [Thu, 31 Jan 2013 14:25:55 +0000 (15:25 +0100)]
Ensure memory is initialized

12 years agoPayload of HOPLIMIT/TCLASS are 8-bit
Gustavo Lopes [Wed, 30 Jan 2013 23:59:05 +0000 (00:59 +0100)]
Payload of HOPLIMIT/TCLASS are 8-bit

12 years agoFix buf in string -> int conv.
Gustavo Lopes [Wed, 30 Jan 2013 23:40:17 +0000 (00:40 +0100)]
Fix buf in string -> int conv.

12 years agoBuild fixes; accept names for if_index
Gustavo Lopes [Tue, 1 Jan 2013 22:38:19 +0000 (23:38 +0100)]
Build fixes; accept names for if_index

12 years agoRefactoring: move stuff to new conversions.c
Gustavo Lopes [Sun, 11 Nov 2012 23:40:38 +0000 (00:40 +0100)]
Refactoring: move stuff to new conversions.c

12 years agoSupport sticky IPV6_PKTINFO
Gustavo Lopes [Tue, 6 Nov 2012 16:27:08 +0000 (17:27 +0100)]
Support sticky IPV6_PKTINFO

12 years agoRename some functions for consistency
Gustavo Lopes [Tue, 6 Nov 2012 12:38:57 +0000 (13:38 +0100)]
Rename some functions for consistency

12 years agoDestroy ancillary registry on shutdown
Gustavo Lopes [Tue, 6 Nov 2012 12:36:40 +0000 (13:36 +0100)]
Destroy ancillary registry on shutdown

12 years agoMove some multicast stuff to multicast.c
Gustavo Lopes [Tue, 6 Nov 2012 11:48:47 +0000 (12:48 +0100)]
Move some multicast stuff to multicast.c

12 years agoFix mcast_ipv6_send test
Gustavo Lopes [Tue, 6 Nov 2012 10:25:23 +0000 (11:25 +0100)]
Fix mcast_ipv6_send test

12 years agoCheck return of fstat()
Gustavo Lopes [Mon, 5 Nov 2012 16:35:46 +0000 (17:35 +0100)]
Check return of fstat()

12 years agoFix build on Mac OS X
Gustavo Lopes [Mon, 5 Nov 2012 16:10:10 +0000 (17:10 +0100)]
Fix build on Mac OS X

By deactivating unsupported features on this OS.

12 years agoRegister extra MSG_* constants
Gustavo Lopes [Mon, 5 Nov 2012 15:12:21 +0000 (16:12 +0100)]
Register extra MSG_* constants

12 years agoAdd test for CMSG_RIGHTS
Gustavo Lopes [Mon, 5 Nov 2012 14:15:36 +0000 (15:15 +0100)]
Add test for CMSG_RIGHTS

12 years agoAdd test for CMSG_CREDENTIALS message
Gustavo Lopes [Mon, 5 Nov 2012 10:40:24 +0000 (11:40 +0100)]
Add test for CMSG_CREDENTIALS message

12 years agoAdded support for AF_UNIX messages
Gustavo Lopes [Sun, 4 Nov 2012 23:38:23 +0000 (00:38 +0100)]
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.

12 years agoRedactor to expose socket_import_file_descriptor()
Gustavo Lopes [Mon, 5 Nov 2012 13:52:48 +0000 (14:52 +0100)]
Redactor to expose socket_import_file_descriptor()

12 years agoImprove imported socket family detection
Gustavo Lopes [Tue, 23 Oct 2012 11:09:38 +0000 (13:09 +0200)]
Improve imported socket family detection

Also added constant SO_FAMILY.

12 years agoAdded missing return statements
Gustavo Lopes [Mon, 5 Nov 2012 10:36:00 +0000 (11:36 +0100)]
Added missing return statements

12 years agoAdd test and slightly tweak another
Gustavo Lopes [Sun, 4 Nov 2012 18:16:10 +0000 (19:16 +0100)]
Add test and slightly tweak another

12 years agoSupport for IPV6_HOPLIMIT and IPV6_TCLASS
Gustavo Lopes [Fri, 2 Nov 2012 16:54:31 +0000 (17:54 +0100)]
Support for IPV6_HOPLIMIT and IPV6_TCLASS

12 years agoFix bug in from_zval_write_control_array()
Gustavo Lopes [Fri, 2 Nov 2012 16:53:48 +0000 (17:53 +0100)]
Fix bug in from_zval_write_control_array()

12 years agoFix bug converting zval sockaddr
Gustavo Lopes [Fri, 2 Nov 2012 16:52:13 +0000 (17:52 +0100)]
Fix bug converting zval sockaddr

The bug ocurred when the family was not specified but was instead guessed.

12 years agoAdd IPV6_UNICAST_HOPS option constant.
Gustavo Lopes [Fri, 2 Nov 2012 14:02:47 +0000 (15:02 +0100)]
Add IPV6_UNICAST_HOPS option constant.

12 years agoAdd test for recvmsg()
Gustavo Lopes [Fri, 2 Nov 2012 13:03:47 +0000 (14:03 +0100)]
Add test for recvmsg()

12 years agoWrap recvmsg() and sendmsg()
Gustavo Lopes [Thu, 1 Nov 2012 19:38:42 +0000 (20:38 +0100)]
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.

12 years agoIgnore warnings on EAGAIN/EWOULDBLOCK/EINPROGRESS
Gustavo Lopes [Sat, 2 Feb 2013 14:43:05 +0000 (15:43 +0100)]
Ignore warnings on EAGAIN/EWOULDBLOCK/EINPROGRESS

See bug #63570

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Gustavo Lopes [Sat, 2 Feb 2013 14:32:03 +0000 (15:32 +0100)]
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

12 years agoMerge branch 'sockets_54_improv' into PHP-5.4
Gustavo Lopes [Sat, 2 Feb 2013 14:31:44 +0000 (15:31 +0100)]
Merge branch 'sockets_54_improv' into PHP-5.4

* sockets_54_improv:
  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

12 years agoFix wrong blocking state being set
Gustavo Lopes [Fri, 1 Feb 2013 15:38:54 +0000 (16:38 +0100)]
Fix wrong blocking state being set

12 years agoFix tests (Windows)
Gustavo Lopes [Fri, 1 Feb 2013 13:58:35 +0000 (14:58 +0100)]
Fix tests (Windows)

12 years agoRemove a Windows only warning
Gustavo Lopes [Sat, 2 Feb 2013 11:44:00 +0000 (12:44 +0100)]
Remove a Windows only warning

12 years agoMove & improve PHP_SOCKET_ERROR def
Gustavo Lopes [Fri, 1 Feb 2013 13:39:56 +0000 (14:39 +0100)]
Move & improve PHP_SOCKET_ERROR def

12 years agoMove some declarations to sockets.c
Gustavo Lopes [Fri, 1 Feb 2013 13:35:14 +0000 (14:35 +0100)]
Move some declarations to sockets.c

12 years agoFix overbroad skipif include
Gustavo Lopes [Fri, 1 Feb 2013 10:12:11 +0000 (11:12 +0100)]
Fix overbroad skipif include

12 years agoFix bug #63830: Segfault on undefined function call in nested generator
Nikita Popov [Fri, 1 Feb 2013 18:48:05 +0000 (19:48 +0100)]
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.

12 years agoNEWS
Remi Collet [Fri, 1 Feb 2013 18:27:10 +0000 (19:27 +0100)]
NEWS

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Remi Collet [Fri, 1 Feb 2013 18:26:11 +0000 (19:26 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #64128 buit-in web server is broken on ppc64.

12 years agoFixed bug #64128 buit-in web server is broken on ppc64.
Remi Collet [Fri, 1 Feb 2013 18:23:25 +0000 (19:23 +0100)]
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.

12 years agoFix segfault when cloning generator with properties
Nikita Popov [Fri, 1 Feb 2013 17:33:26 +0000 (18:33 +0100)]
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.

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Andrey Hristov [Fri, 1 Feb 2013 16:22:21 +0000 (17:22 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

12 years agoadd new charset, from MySQL 5.6
Andrey Hristov [Fri, 1 Feb 2013 16:21:50 +0000 (17:21 +0100)]
add new charset, from MySQL 5.6

12 years agofix enchant compilation under vc11
Anatoliy Belsky [Fri, 1 Feb 2013 11:43:26 +0000 (12:43 +0100)]
fix enchant compilation under vc11

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Johannes Schlüter [Fri, 1 Feb 2013 11:32:00 +0000 (12:32 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

12 years agoFix typo in error message
Johannes Schlüter [Fri, 1 Feb 2013 11:31:07 +0000 (12:31 +0100)]
Fix typo in error message

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Remi Collet [Thu, 31 Jan 2013 13:39:42 +0000 (14:39 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Mark this test as requiring internet connecion.

12 years agoMark this test as requiring internet connecion.
Remi Collet [Thu, 31 Jan 2013 13:38:39 +0000 (14:38 +0100)]
Mark this test as requiring internet connecion.

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Remi Collet [Thu, 31 Jan 2013 13:25:43 +0000 (14:25 +0100)]
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

12 years agoFix failed test: sys_errlist[116] have changed on recent glibc (Fedora 18)
Remi Collet [Thu, 31 Jan 2013 13:22:56 +0000 (14:22 +0100)]
Fix failed test: sys_errlist[116] have changed on recent glibc (Fedora 18)
old: Stale NFS file handle
new: Stale file handle

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Johannes Schlüter [Wed, 30 Jan 2013 23:59:10 +0000 (00:59 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Wed, 30 Jan 2013 23:58:52 +0000 (00:58 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4

Conflicts:
configure.in
main/php_version.h

12 years agoThis will be PHP 5.3.23
Johannes Schlüter [Wed, 30 Jan 2013 23:57:29 +0000 (00:57 +0100)]
This will be PHP 5.3.23