]> granicus.if.org Git - php/log
php
10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Tue, 14 Oct 2014 18:43:34 +0000 (11:43 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix return code (merges are hard :( )

10 years agoFix return code (merges are hard :( )
Stanislav Malyshev [Tue, 14 Oct 2014 18:42:33 +0000 (11:42 -0700)]
Fix return code (merges are hard :( )

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Tue, 14 Oct 2014 17:45:47 +0000 (10:45 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix bug #68113 (Heap corruption in exif_thumbnail())
  Fix bug #68089 - do not accept options with embedded \0
  Fixed bug #68044: Integer overflow in unserialize() (32-bits only)
  Fix bug #68027 - fix date parsing in XMLRPC lib

10 years agoFix bug #68113 (Heap corruption in exif_thumbnail())
Stanislav Malyshev [Sun, 28 Sep 2014 23:57:42 +0000 (16:57 -0700)]
Fix bug #68113 (Heap corruption in exif_thumbnail())

10 years agoFix bug #68089 - do not accept options with embedded \0
Stanislav Malyshev [Mon, 29 Sep 2014 00:53:49 +0000 (17:53 -0700)]
Fix bug #68089 - do not accept options with embedded \0

Conflicts:
ext/curl/interface.c

10 years agoFixed bug #68044: Integer overflow in unserialize() (32-bits only)
Stanislav Malyshev [Sun, 28 Sep 2014 21:19:31 +0000 (14:19 -0700)]
Fixed bug #68044: Integer overflow in unserialize() (32-bits only)

10 years agoFix bug #68027 - fix date parsing in XMLRPC lib
Stanislav Malyshev [Mon, 29 Sep 2014 00:33:44 +0000 (17:33 -0700)]
Fix bug #68027 - fix date parsing in XMLRPC lib

10 years agoFix bug #68113 (Heap corruption in exif_thumbnail())
Stanislav Malyshev [Sun, 28 Sep 2014 23:57:42 +0000 (16:57 -0700)]
Fix bug #68113 (Heap corruption in exif_thumbnail())

10 years agoFix bug #68089 - do not accept options with embedded \0
Stanislav Malyshev [Mon, 29 Sep 2014 00:53:49 +0000 (17:53 -0700)]
Fix bug #68089 - do not accept options with embedded \0

Conflicts:
ext/curl/interface.c

10 years agoFixed bug #68044: Integer overflow in unserialize() (32-bits only)
Stanislav Malyshev [Sun, 28 Sep 2014 21:19:31 +0000 (14:19 -0700)]
Fixed bug #68044: Integer overflow in unserialize() (32-bits only)

10 years agoFix bug #68027 - fix date parsing in XMLRPC lib
Stanislav Malyshev [Mon, 29 Sep 2014 00:33:44 +0000 (17:33 -0700)]
Fix bug #68027 - fix date parsing in XMLRPC lib

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Tjerk Meesters [Tue, 14 Oct 2014 14:50:07 +0000 (22:50 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #68128

10 years agoFixed bug #68128
Tjerk Meesters [Mon, 6 Oct 2014 01:40:39 +0000 (09:40 +0800)]
Fixed bug #68128

Three issues are addressed:

- RecursiveRegexIterator::accept() should accept non-empty arrays without
  applying any regular expression and RegexIterator::accept() should not accept
  an array.
- RegexIterator::accept() should not accept an atom that fails to match
  anything, even when PREG_PATTERN_ORDER is used (which would return an array
  of empty arrays).
- RecursiveRegexIterator::getChildren() should pass all constructor arguments
  to its child iterator instead of just the regular expression.

10 years agoupdate NEWS and UPGRADING
Stanislav Malyshev [Tue, 14 Oct 2014 07:36:36 +0000 (00:36 -0700)]
update NEWS and UPGRADING

10 years agoMerge branch 'pull-request/839' into PHP-5.6
Stanislav Malyshev [Tue, 14 Oct 2014 07:33:16 +0000 (00:33 -0700)]
Merge branch 'pull-request/839' into PHP-5.6

* pull-request/839:
  Upated NEWS
  Address issues raised by @nikic
  Make sure min < max
  Mersenne Twister was added in GMP 4.2
  Add test files
  Add gmp_random_bits(bits) and gmp_random_range(min, max)
  Change GMPs default PRNG to Mersenne Twister

10 years agoWe can't eliminate FETCH_CONSTANT opcodes for constants represented by AST.
Dmitry Stogov [Mon, 13 Oct 2014 10:07:37 +0000 (14:07 +0400)]
We can't eliminate FETCH_CONSTANT opcodes for constants represented by AST.

10 years agoDLL export several APIs needed for phpdbg
Anatol Belski [Sun, 12 Oct 2014 17:22:03 +0000 (19:22 +0200)]
DLL export several APIs needed for phpdbg

10 years agoMore fixes for nodelist array access
Tjerk Meesters [Sun, 12 Oct 2014 04:47:58 +0000 (12:47 +0800)]
More fixes for nodelist array access
- testing for null property read
- no zval copying if the type is already long
- memory fix for master

10 years agoupdate NEWS
Ard Biesheuvel [Fri, 10 Oct 2014 09:45:24 +0000 (11:45 +0200)]
update NEWS

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Ard Biesheuvel [Fri, 10 Oct 2014 09:44:52 +0000 (11:44 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

10 years agoupdate NEWS
Ard Biesheuvel [Fri, 10 Oct 2014 09:44:39 +0000 (11:44 +0200)]
update NEWS

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Ard Biesheuvel [Fri, 10 Oct 2014 09:41:10 +0000 (11:41 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

10 years agoupdate NEWS
Ard Biesheuvel [Fri, 10 Oct 2014 09:40:07 +0000 (11:40 +0200)]
update NEWS

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
10 years agoAdded note to UPGRADING regarding 64-bit support in pack()/unpack()
Tjerk Meesters [Thu, 9 Oct 2014 23:33:06 +0000 (07:33 +0800)]
Added note to UPGRADING regarding 64-bit support in pack()/unpack()

10 years agoRFC: 64 bit format codes for pack() and unpack()
Tjerk Meesters [Thu, 9 Oct 2014 23:00:38 +0000 (07:00 +0800)]
RFC: 64 bit format codes for pack() and unpack()

10 years agoAdd 64 bit formats to pack() and unpack()
Leigh [Mon, 8 Sep 2014 20:59:32 +0000 (21:59 +0100)]
Add 64 bit formats to pack() and unpack()

10 years agoRefactored DOMNodeList array dereferencing implementation
Tjerk Meesters [Thu, 9 Oct 2014 15:07:12 +0000 (23:07 +0800)]
Refactored DOMNodeList array dereferencing implementation

10 years agoUpdated NEWS for #67949
Tjerk Meesters [Thu, 9 Oct 2014 08:18:14 +0000 (16:18 +0800)]
Updated NEWS for #67949

10 years agoMerge branch 'pr/846' into PHP-5.6
Tjerk Meesters [Thu, 9 Oct 2014 07:55:10 +0000 (15:55 +0800)]
Merge branch 'pr/846' into PHP-5.6

* pr/846:
  DOMNodeList elements are accessible through array notation

10 years agoUpdated NEWS for #68129
Tjerk Meesters [Thu, 9 Oct 2014 00:24:30 +0000 (08:24 +0800)]
Updated NEWS for #68129

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Tjerk Meesters [Thu, 9 Oct 2014 00:24:05 +0000 (08:24 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Updated NEWS for #68129
  Fixed bug #68129

10 years agoUpdated NEWS for #68129
Tjerk Meesters [Thu, 9 Oct 2014 00:23:42 +0000 (08:23 +0800)]
Updated NEWS for #68129

10 years agoFixed bug #68129
Tjerk Meesters [Sun, 5 Oct 2014 23:27:05 +0000 (07:27 +0800)]
Fixed bug #68129

Empty usernames and passwords are now treated differently from no username or password

For example, empty password:

    ftp://user:@example.org

Empty username:

    ftp://:password@example.org

Empty username and empty password

    ftp://:@example.org

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Dmitry Stogov [Wed, 8 Oct 2014 17:49:53 +0000 (21:49 +0400)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Added info about ext/opcache

10 years agoAdded info about ext/opcache
Dmitry Stogov [Wed, 8 Oct 2014 17:48:44 +0000 (21:48 +0400)]
Added info about ext/opcache

10 years agoAdd to NEWS
Keyur Govande [Tue, 7 Oct 2014 21:22:54 +0000 (21:22 +0000)]
Add to NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Keyur Govande [Tue, 7 Oct 2014 21:22:07 +0000 (21:22 +0000)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Add to NEWS
  Fix for bug #68087 (ODBC not reading DATE columns correctly)

10 years agoAdd to NEWS
Keyur Govande [Tue, 7 Oct 2014 21:21:23 +0000 (21:21 +0000)]
Add to NEWS

10 years agoFix for bug #68087 (ODBC not reading DATE columns correctly)
Keyur Govande [Tue, 7 Oct 2014 21:17:36 +0000 (21:17 +0000)]
Fix for bug #68087 (ODBC not reading DATE columns correctly)

Temporary variable indicating column field type ID should be
reset to default for loop iteration (i.e. every column in the
record set. The old buggy code made it persist across all columns
leading to invalid reads from the buffer, if for example a DATE
column was preceded by a VARCHAR column.

10 years agoAdd to NEWS
Keyur Govande [Tue, 7 Oct 2014 21:09:47 +0000 (21:09 +0000)]
Add to NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Keyur Govande [Tue, 7 Oct 2014 21:08:18 +0000 (21:08 +0000)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Add to NEWS
  Fix for bug #68114 (Build fails on OS X due to undefined symbols)

10 years agoAdd to NEWS
Keyur Govande [Tue, 7 Oct 2014 21:07:19 +0000 (21:07 +0000)]
Add to NEWS

10 years agoFix for bug #68114 (Build fails on OS X due to undefined symbols)
Keyur Govande [Tue, 7 Oct 2014 20:58:43 +0000 (20:58 +0000)]
Fix for bug #68114 (Build fails on OS X due to undefined symbols)

gcc (i686-apple-darwin10-gcc-4.2.1) on OS X cannot link fixed-width
decimals and fails with undefined symbols errors like ___extendsddf.
If configure used gcc for compiling it would notice and mark the
feature HAVE_DECIMAL_FP_SUPPORT as unsupported.
But configure seems to use cc (i686-apple-darwin10-llvm-gcc-4.2)
instead, which doesn't support fixed-width decimals either, but the
code compiles and links just fine. I suspect it may have something
to do with the llvm backend printed in the version.
Lacking the time to debug this further, the patch fixes the issue by
checking the expected output when fixed-width decimal support is
present and correctly implemented.

10 years agoUpated NEWS
Leigh [Tue, 7 Oct 2014 13:28:02 +0000 (14:28 +0100)]
Upated NEWS

10 years agoMerge branch 'PHP-5.6' of https://github.com/php/php-src into gmp-random
Leigh [Tue, 7 Oct 2014 13:25:44 +0000 (14:25 +0100)]
Merge branch 'PHP-5.6' of https://github.com/php/php-src into gmp-random

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Johannes Schlüter [Sat, 4 Oct 2014 18:06:44 +0000 (20:06 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

10 years agoFix accidental edit in previous commit
Johannes Schlüter [Sat, 4 Oct 2014 18:06:02 +0000 (20:06 +0200)]
Fix accidental edit in previous commit

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Johannes Schlüter [Sat, 4 Oct 2014 18:00:10 +0000 (20:00 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

10 years agoFix arginfo
Johannes Schlüter [Sat, 4 Oct 2014 17:59:21 +0000 (19:59 +0200)]
Fix arginfo

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Derick Rethans [Sat, 4 Oct 2014 14:59:17 +0000 (15:59 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Derick Rethans [Sat, 4 Oct 2014 14:58:40 +0000 (15:58 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

10 years agoDateTimeZone::getOffset() now accepts a DateTimeInterface
Florian MARGAINE [Mon, 22 Sep 2014 21:35:29 +0000 (23:35 +0200)]
DateTimeZone::getOffset() now accepts a DateTimeInterface

Fixes #68062

10 years agoMerge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
George Wang [Fri, 3 Oct 2014 20:43:35 +0000 (16:43 -0400)]
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6

10 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
George Wang [Fri, 3 Oct 2014 20:43:08 +0000 (16:43 -0400)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

10 years agoFixed a bug that causes crash when environment variable is access while parsing php.ini
George Wang [Fri, 3 Oct 2014 20:41:32 +0000 (16:41 -0400)]
Fixed a bug that causes crash when environment variable is access while parsing php.ini

10 years agoFixed a bug that causes crash when environment variable is access while parsing php.ini
George Wang [Fri, 3 Oct 2014 20:41:32 +0000 (16:41 -0400)]
Fixed a bug that causes crash when environment variable is access while parsing php.ini

10 years agoFixed a bug that causes crash when environment variable is access while parsing php.ini
George Wang [Fri, 3 Oct 2014 20:41:32 +0000 (16:41 -0400)]
Fixed a bug that causes crash when environment variable is access while parsing php.ini

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Nikita Popov [Fri, 3 Oct 2014 19:42:11 +0000 (21:42 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

10 years agoFix bug number
Nikita Popov [Fri, 3 Oct 2014 19:41:58 +0000 (21:41 +0200)]
Fix bug number

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Nikita Popov [Fri, 3 Oct 2014 19:26:51 +0000 (21:26 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

10 years agoFix bug #68188
Nikita Popov [Fri, 3 Oct 2014 19:24:28 +0000 (21:24 +0200)]
Fix bug #68188

10 years agoNEWS entry for previous commit
Ferenc Kovacs [Fri, 3 Oct 2014 09:39:53 +0000 (11:39 +0200)]
NEWS entry for previous commit

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Ferenc Kovacs [Fri, 3 Oct 2014 09:39:09 +0000 (11:39 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS entry for previous commit
  add IPv6 support to php-fpm

10 years agoNEWS entry for previous commit
Ferenc Kovacs [Fri, 3 Oct 2014 09:38:32 +0000 (11:38 +0200)]
NEWS entry for previous commit

10 years agoadd IPv6 support to php-fpm
Robin Gloster [Fri, 3 Oct 2014 09:35:27 +0000 (11:35 +0200)]
add IPv6 support to php-fpm

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Sara Golemon [Fri, 3 Oct 2014 01:55:29 +0000 (18:55 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Add hash to EXTENSIONS file

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Sara Golemon [Fri, 3 Oct 2014 01:55:14 +0000 (18:55 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Add hash to EXTENSIONS file

10 years agoAdd hash to EXTENSIONS file
Sara Golemon [Fri, 3 Oct 2014 01:54:46 +0000 (18:54 -0700)]
Add hash to EXTENSIONS file

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Ferenc Kovacs [Thu, 2 Oct 2014 20:32:18 +0000 (22:32 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  we also have xz release tarballs since 5.5
  5.5.19 now

Conflicts:
configure.in
main/php_version.h

10 years agowe also have xz release tarballs since 5.5
Ferenc Kovacs [Thu, 2 Oct 2014 20:28:19 +0000 (22:28 +0200)]
we also have xz release tarballs since 5.5

10 years ago5.5.19 now
Julien Pauli [Wed, 1 Oct 2014 14:16:05 +0000 (16:16 +0200)]
5.5.19 now

10 years agoupdate NEWS about the release date of 5.6.1
Ferenc Kovacs [Wed, 1 Oct 2014 09:15:59 +0000 (11:15 +0200)]
update NEWS about the release date of 5.6.1

10 years agoonly no_NO.ISO-8859-1 have to be ignored
Remi Collet [Wed, 1 Oct 2014 08:14:14 +0000 (10:14 +0200)]
only no_NO.ISO-8859-1 have to be ignored

10 years agoremove bogus locale use from test
krakjoe [Thu, 21 Aug 2014 09:03:48 +0000 (10:03 +0100)]
remove bogus locale use from test

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Remi Collet [Wed, 1 Oct 2014 07:26:46 +0000 (09:26 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  use $PHP_LIBDIR instread of "lib" in skel example

10 years agouse $PHP_LIBDIR instread of "lib" in skel example
Remi Collet [Wed, 1 Oct 2014 07:26:21 +0000 (09:26 +0200)]
use $PHP_LIBDIR instread of "lib" in skel example

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Anatol Belski [Mon, 29 Sep 2014 18:30:43 +0000 (20:30 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix test filename

10 years agofix test filename
Anatol Belski [Mon, 29 Sep 2014 18:30:18 +0000 (20:30 +0200)]
fix test filename

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Anatol Belski [Mon, 29 Sep 2014 18:19:31 +0000 (20:19 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  one more test to illustrate transfer of an arbitrary data amount throug pipes

10 years agoone more test to illustrate transfer of an arbitrary data amount throug pipes
Anatol Belski [Mon, 29 Sep 2014 18:18:33 +0000 (20:18 +0200)]
one more test to illustrate transfer of an arbitrary data amount throug pipes

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Anatol Belski [Mon, 29 Sep 2014 16:12:56 +0000 (18:12 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix tests on linux
  better test cleanup

10 years agofix tests on linux
Anatol Belski [Mon, 29 Sep 2014 16:12:25 +0000 (18:12 +0200)]
fix tests on linux

10 years agobetter test cleanup
Anatol Belski [Mon, 29 Sep 2014 16:11:06 +0000 (18:11 +0200)]
better test cleanup

and even force the XFAIL to fail as it would take too long anyway, even if it passes

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Anatol Belski [Mon, 29 Sep 2014 15:28:27 +0000 (17:28 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  increase the polling period to not to break existing behaviours

10 years agoincrease the polling period to not to break existing behaviours
Anatol Belski [Mon, 29 Sep 2014 15:27:24 +0000 (17:27 +0200)]
increase the polling period to not to break existing behaviours

10 years agoupdated NEWS
Anatol Belski [Mon, 29 Sep 2014 14:28:12 +0000 (16:28 +0200)]
updated NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Anatol Belski [Mon, 29 Sep 2014 14:27:33 +0000 (16:27 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #51800 proc_open on Windows hangs forever

10 years agoFixed bug #51800 proc_open on Windows hangs forever
Anatol Belski [Mon, 29 Sep 2014 14:24:34 +0000 (16:24 +0200)]
Fixed bug #51800 proc_open on Windows hangs forever

This loop can block for some minutes, theoretically. Practially
however, this is a 99% non issue for a normal use case. This is
required because read() is synchronous. The PHP streams API wants
to fill its internal buffers, therefore it might try to read some
more data than user has demanded. Also, for a case where we want
to read X bytes, but neither enough data nor EOF arrives, read()
will block until it could fill the buffer. If a counterpart station
runs slowly or delivers not all the data at once, read() would
still be waiting. If we quit too early, we possibly could loose
some data from the pipe. Thus it has to emulate the read()
behaviour, but obviously not completely, just to some grade.

Reading big data amount is for sure an issue on any platforms, it
depends on the pipe buffer size, which is controlled by the system.
On Windows, the buffer size seems to be way too small, which causes
buffer congestion and a dead lock. It is essential to read the pipe
descriptors simultaneously and possibly in the same order as the
opposite writes them.

Thus, this will work with smaller buffer data sizes passed through
pipes. As MSDN states, anonymous pipes don't support asynchronous
operations. Neither anonymous pipes do support select() as they are
not SOCKETs but file descriptors. Consequently - bigger data sizes
will need a better solution based on threads. However it is much
more expencive. Maybe a better solution could be exporting a part
of the internal doing as a userspace function which could perform
some kind of lookahead operation on the pipe descriptor.

This is just the first stone, depending on the user feedback we
might go for further improvements in this area.

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Sun, 28 Sep 2014 19:25:49 +0000 (12:25 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Set an LDAP error code when failing ldap_bind due to null bytes

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Sun, 28 Sep 2014 19:25:24 +0000 (12:25 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Set an LDAP error code when failing ldap_bind due to null bytes

10 years agoSet an LDAP error code when failing ldap_bind due to null bytes
Matthew Daley [Sun, 28 Sep 2014 04:49:35 +0000 (17:49 +1300)]
Set an LDAP error code when failing ldap_bind due to null bytes

Some applications check a LDAP link's error code after seeing ldap_bind
fail due to a null byte bind attempt and hence incorrectly receive the
last set error code.

Fix by setting an LDAP error code before returning in this case.

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Johannes Schlüter [Sat, 27 Sep 2014 00:18:29 +0000 (02:18 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Johannes Schlüter [Sat, 27 Sep 2014 00:17:52 +0000 (02:17 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

10 years agoThis test should pass
Johannes Schlüter [Sat, 27 Sep 2014 00:17:26 +0000 (02:17 +0200)]
This test should pass

10 years agoDOMNodeList elements are accessible through array notation
Florian MARGAINE [Fri, 26 Sep 2014 16:25:56 +0000 (18:25 +0200)]
DOMNodeList elements are accessible through array notation

Fixes #67949

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Derick Rethans [Fri, 26 Sep 2014 15:27:05 +0000 (16:27 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Derick Rethans [Fri, 26 Sep 2014 15:27:00 +0000 (16:27 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

10 years ago- Updated to version 2014.8 (2014h)
Derick Rethans [Fri, 26 Sep 2014 15:26:59 +0000 (16:26 +0100)]
- Updated to version 2014.8 (2014h)

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Fri, 26 Sep 2014 08:01:39 +0000 (01:01 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix date
  update NEWS
  Revert xp_ssl.c to the state of 5.4.32 due to regressions

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Fri, 26 Sep 2014 08:00:20 +0000 (01:00 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  update NEWS
  Revert xp_ssl.c to the state of 5.4.32 due to regressions

Conflicts:
ext/openssl/xp_ssl.c