]> granicus.if.org Git - php/log
php
11 years agoadd NEWS block for 5.6.0alpha3
Ferenc Kovacs [Thu, 6 Feb 2014 12:48:57 +0000 (13:48 +0100)]
add NEWS block for 5.6.0alpha3

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Anatol Belski [Thu, 6 Feb 2014 08:17:54 +0000 (09:17 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  updated libs_version.txt
  update libs_version.txt

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Anatol Belski [Thu, 6 Feb 2014 08:17:29 +0000 (09:17 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  update libs_version.txt

Conflicts:
win32/build/libs_version.txt

11 years agoupdated libs_version.txt
Anatol Belski [Thu, 6 Feb 2014 08:15:28 +0000 (09:15 +0100)]
updated libs_version.txt

11 years agoupdated libs_version.txt
Anatol Belski [Thu, 6 Feb 2014 08:14:30 +0000 (09:14 +0100)]
updated libs_version.txt

11 years agoupdate libs_version.txt
Anatol Belski [Thu, 6 Feb 2014 08:13:05 +0000 (09:13 +0100)]
update libs_version.txt

11 years agomore tests for ICU >= 52.1 compat
Anatol Belski [Wed, 5 Feb 2014 19:13:48 +0000 (20:13 +0100)]
more tests for ICU >= 52.1 compat

11 years agofix tests for ICU >= 52.1
Anatol Belski [Wed, 5 Feb 2014 18:16:14 +0000 (19:16 +0100)]
fix tests for ICU >= 52.1

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Hannes Magnusson [Wed, 5 Feb 2014 18:17:49 +0000 (10:17 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix year

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Hannes Magnusson [Wed, 5 Feb 2014 18:15:50 +0000 (10:15 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix year

11 years agoFix year
Hannes Magnusson [Wed, 5 Feb 2014 18:15:11 +0000 (10:15 -0800)]
Fix year

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Anatol Belski [Wed, 5 Feb 2014 14:17:30 +0000 (15:17 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  adapt test to curl 7.35.0 upgrade

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Anatol Belski [Wed, 5 Feb 2014 14:16:57 +0000 (15:16 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  adapt test to curl 7.35.0 upgrade

11 years agoadapt test to curl 7.35.0 upgrade
Anatol Belski [Wed, 5 Feb 2014 14:15:34 +0000 (15:15 +0100)]
adapt test to curl 7.35.0 upgrade

which is a security one and should be performed as in
http://curl.haxx.se/docs/adv_20140129.html

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Anatol Belski [Wed, 5 Feb 2014 09:52:00 +0000 (10:52 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  move the NEWS entry into the right section

11 years agomove the NEWS entry into the right section
Anatol Belski [Wed, 5 Feb 2014 09:51:08 +0000 (10:51 +0100)]
move the NEWS entry into the right section

11 years agoFixed SNI failure from missing Z_STRVAL_PP
Daniel Lowrey [Wed, 5 Feb 2014 02:11:56 +0000 (19:11 -0700)]
Fixed SNI failure from missing Z_STRVAL_PP

11 years agoupdated NEWS
Anatol Belski [Tue, 4 Feb 2014 09:39:18 +0000 (10:39 +0100)]
updated NEWS

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Anatol Belski [Tue, 4 Feb 2014 09:38:46 +0000 (10:38 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  updated NEWS

11 years agoupdated NEWS
Anatol Belski [Tue, 4 Feb 2014 09:38:17 +0000 (10:38 +0100)]
updated NEWS

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Anatol Belski [Tue, 4 Feb 2014 09:34:51 +0000 (10:34 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  pcre tests go with 8.34 upgrade

11 years agopcre tests go with 8.34 upgrade
Anatol Belski [Tue, 4 Feb 2014 09:34:11 +0000 (10:34 +0100)]
pcre tests go with 8.34 upgrade

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Anatol Belski [Tue, 4 Feb 2014 09:31:52 +0000 (10:31 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  pcre upgraded to 8.34

11 years agopcre upgraded to 8.34
Anatol Belski [Tue, 4 Feb 2014 09:31:07 +0000 (10:31 +0100)]
pcre upgraded to 8.34

11 years agomention the openssl SPKAC functions commited to master before branching out 5.6....
Ferenc Kovacs [Mon, 3 Feb 2014 03:20:16 +0000 (04:20 +0100)]
mention the openssl SPKAC functions commited to master before branching out 5.6. see https://github.com/php/php-src/pull/267

11 years agowindows
krakjoe [Sun, 2 Feb 2014 15:14:25 +0000 (15:14 +0000)]
windows

11 years agoclean symbols
krakjoe [Sun, 2 Feb 2014 15:10:17 +0000 (15:10 +0000)]
clean symbols

11 years agoanother patch from upstream
krakjoe [Sun, 2 Feb 2014 14:58:39 +0000 (14:58 +0000)]
another patch from upstream

11 years agowoops
krakjoe [Sun, 2 Feb 2014 14:50:32 +0000 (14:50 +0000)]
woops

11 years agobetter use of tmpnam/mkstemp
krakjoe [Sun, 2 Feb 2014 14:42:31 +0000 (14:42 +0000)]
better use of tmpnam/mkstemp

11 years agoupdate version
krakjoe [Sun, 2 Feb 2014 14:04:47 +0000 (14:04 +0000)]
update version

11 years agoremove use of zend directly, avoid leaks/bugs in modules etc
krakjoe [Sun, 2 Feb 2014 13:43:43 +0000 (13:43 +0000)]
remove use of zend directly, avoid leaks/bugs in modules etc

11 years agoMerge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6
krakjoe [Sun, 2 Feb 2014 13:42:01 +0000 (13:42 +0000)]
Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6

11 years agoRemove #if PHP_VERSION_ID version checks
Daniel Lowrey [Sat, 1 Feb 2014 15:01:13 +0000 (08:01 -0700)]
Remove #if PHP_VERSION_ID version checks

11 years agoUse master-agnostic zend_is_true checks
Daniel Lowrey [Fri, 31 Jan 2014 21:18:31 +0000 (14:18 -0700)]
Use master-agnostic zend_is_true checks

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Thu, 30 Jan 2014 07:48:34 +0000 (23:48 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  tests still failing, so xfail for now until fixed
  tests still failing, so xfail for now until fixed

11 years agotests still failing, so xfail for now until fixed
Stanislav Malyshev [Thu, 30 Jan 2014 01:40:39 +0000 (17:40 -0800)]
tests still failing, so xfail for now until fixed

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Thu, 30 Jan 2014 07:48:19 +0000 (23:48 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  tests still failing, so xfail for now until fixed

11 years agotests still failing, so xfail for now until fixed
Stanislav Malyshev [Thu, 30 Jan 2014 01:40:39 +0000 (17:40 -0800)]
tests still failing, so xfail for now until fixed

11 years agotests still failing, so xfail for now until fixed
Stanislav Malyshev [Thu, 30 Jan 2014 01:40:39 +0000 (17:40 -0800)]
tests still failing, so xfail for now until fixed

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Yasuo Ohgaki [Thu, 30 Jan 2014 05:16:47 +0000 (14:16 +0900)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug data->fd not set to -1 for open_basedir failure.

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Yasuo Ohgaki [Thu, 30 Jan 2014 05:16:05 +0000 (14:16 +0900)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug data->fd not set to -1 for open_basedir failure.

11 years agoFixed bug data->fd not set to -1 for open_basedir failure.
Yasuo Ohgaki [Thu, 30 Jan 2014 05:15:29 +0000 (14:15 +0900)]
Fixed bug data->fd not set to -1 for open_basedir failure.

11 years agoFixed build breakage from b4b4d9697f
Daniel Lowrey [Thu, 30 Jan 2014 00:57:59 +0000 (17:57 -0700)]
Fixed build breakage from b4b4d9697f

11 years agoMerge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
Andrey Hristov [Wed, 29 Jan 2014 13:28:47 +0000 (15:28 +0200)]
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6

11 years agoAdd new INI for rollbacking connections put back into the pconn pool
Andrey Hristov [Wed, 29 Jan 2014 13:27:43 +0000 (15:27 +0200)]
Add new INI for rollbacking connections put back into the pconn pool
as well a function get the the statistics in easier way than ob_start()
and parsing phpinfo().

11 years agozip extension version 1.12.4
Remi Collet [Wed, 29 Jan 2014 13:00:50 +0000 (14:00 +0100)]
zip extension version 1.12.4

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Remi Collet [Wed, 29 Jan 2014 08:57:04 +0000 (09:57 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed Request #66574 Allow multiple paths in php_ini_scanned_path

11 years agoFixed Request #66574 Allow multiple paths in php_ini_scanned_path
Remi Collet [Wed, 29 Jan 2014 08:53:22 +0000 (09:53 +0100)]
Fixed Request #66574 Allow multiple paths in php_ini_scanned_path

php_ini_scanned_path, from --with-config-file-scan-dir option or
from PHP_INI_SCAN_DIR environment variable allow a single path.

In some case it could be useful to allow multiple.

In the proposed patch, multiple paths are allow, using syntax inspired
from Unix MANPATH (: separated list, empty string for builtin value).

For example, this allow to use:
PHP_INI_SCAN_DIR=/foo/php.d:/bar/php.d   php
PHP_INI_SCAN_DIR=:/myproject/php.d       php
PHP_INI_SCAN_DIR=/myproject/php.d:       php

Real use case: in SCL for dependent collections where each collection
provides a separate tree for extensions, libraries and ini files.

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Yasuo Ohgaki [Wed, 29 Jan 2014 06:53:57 +0000 (15:53 +0900)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed zend.multibyte tests partially

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Yasuo Ohgaki [Wed, 29 Jan 2014 06:51:47 +0000 (15:51 +0900)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed zend.multibyte tests partially

11 years agoFixed zend.multibyte tests partially
Yasuo Ohgaki [Wed, 29 Jan 2014 06:41:30 +0000 (15:41 +0900)]
Fixed zend.multibyte tests partially

11 years agoUpdate NEWS/UPGRADING
Daniel Lowrey [Tue, 28 Jan 2014 17:27:00 +0000 (10:27 -0700)]
Update NEWS/UPGRADING

11 years agoVerify peers by default in client socket operations
Daniel Lowrey [Tue, 28 Jan 2014 17:05:56 +0000 (10:05 -0700)]
Verify peers by default in client socket operations

11 years agoMerge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
Andrey Hristov [Tue, 28 Jan 2014 13:56:17 +0000 (15:56 +0200)]
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Andrey Hristov [Tue, 28 Jan 2014 13:38:14 +0000 (15:38 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Andrey Hristov [Tue, 28 Jan 2014 13:33:16 +0000 (15:33 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoadd text for the new constants
Andrey Hristov [Tue, 28 Jan 2014 13:32:59 +0000 (15:32 +0200)]
add text for the new constants

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Andrey Hristov [Tue, 28 Jan 2014 13:24:45 +0000 (15:24 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoMerge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
Andrey Hristov [Tue, 28 Jan 2014 13:23:54 +0000 (15:23 +0200)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

11 years agoadd new consts
Andrey Hristov [Tue, 28 Jan 2014 13:23:41 +0000 (15:23 +0200)]
add new consts

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Bob Weinand [Tue, 28 Jan 2014 12:34:33 +0000 (13:34 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Bob Weinand [Tue, 28 Jan 2014 12:33:44 +0000 (13:33 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoFixed arginfo of PDO::__construct() to match the docs and zend_parse_parameters defin...
Bob Weinand [Tue, 28 Jan 2014 12:31:52 +0000 (13:31 +0100)]
Fixed arginfo of PDO::__construct() to match the docs and zend_parse_parameters definition.

11 years agofix *.dsp files related to bug #50333
Anatol Belski [Tue, 28 Jan 2014 12:09:29 +0000 (13:09 +0100)]
fix *.dsp files related to bug #50333

11 years agoUpdate NEWS/UPGRADING
Daniel Lowrey [Mon, 27 Jan 2014 21:58:04 +0000 (14:58 -0700)]
Update NEWS/UPGRADING

11 years agoPrevent invalid SAN peer verification on null byte prefix attack
Daniel Lowrey [Mon, 27 Jan 2014 21:51:22 +0000 (14:51 -0700)]
Prevent invalid SAN peer verification on null byte prefix attack

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Yasuo Ohgaki [Mon, 27 Jan 2014 09:57:45 +0000 (18:57 +0900)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Remove obsolete description

Conflicts:
php.ini-development
php.ini-production

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Yasuo Ohgaki [Mon, 27 Jan 2014 09:55:50 +0000 (18:55 +0900)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Remove obsolete description

11 years agoRemove obsolete description
Yasuo Ohgaki [Mon, 27 Jan 2014 09:41:31 +0000 (18:41 +0900)]
Remove obsolete description

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Mon, 27 Jan 2014 01:21:14 +0000 (17:21 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix English and improve by Stas. Thanks :)
  Update source docs
  Revert "Update source docs"
  Update source docs

Conflicts:
README.EXTENSIONS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Mon, 27 Jan 2014 01:20:21 +0000 (17:20 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix English and improve by Stas. Thanks :)
  Update source docs
  Revert "Update source docs"
  Update source docs

11 years agoFix English and improve by Stas. Thanks :)
Yasuo Ohgaki [Sun, 26 Jan 2014 21:50:11 +0000 (06:50 +0900)]
Fix English and improve by Stas. Thanks :)

11 years agoUpdate source docs
Yasuo Ohgaki [Sun, 26 Jan 2014 09:31:27 +0000 (18:31 +0900)]
Update source docs

11 years agoRevert "Update source docs"
Yasuo Ohgaki [Sun, 26 Jan 2014 09:30:25 +0000 (18:30 +0900)]
Revert "Update source docs"

This reverts commit 10d06cd4ff3038d2f02a18936793969e7aee0bda.

11 years agoUpdate source docs
Yasuo Ohgaki [Sun, 26 Jan 2014 09:28:21 +0000 (18:28 +0900)]
Update source docs

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Sun, 26 Jan 2014 23:51:38 +0000 (15:51 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  drop precision since trigonometric functions are non-portable
  XFAIL multibyte tests until they are fixed (bug 66582)

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Sun, 26 Jan 2014 23:51:27 +0000 (15:51 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  drop precision since trigonometric functions are non-portable
  XFAIL multibyte tests until they are fixed (bug 66582)

11 years agodrop precision since trigonometric functions are non-portable
Stanislav Malyshev [Sun, 26 Jan 2014 23:14:16 +0000 (15:14 -0800)]
drop precision since trigonometric functions are non-portable

See: http://stackoverflow.com/questions/21212326/floating-point-arithmetic-and-reproducibility

11 years agoXFAIL multibyte tests until they are fixed (bug 66582)
Stanislav Malyshev [Sun, 26 Jan 2014 23:11:15 +0000 (15:11 -0800)]
XFAIL multibyte tests until they are fixed (bug 66582)

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Sun, 26 Jan 2014 23:15:50 +0000 (15:15 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  drop precision since trigonometric functions are non-portable

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Sun, 26 Jan 2014 23:15:38 +0000 (15:15 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  drop precision since trigonometric functions are non-portable

11 years agodrop precision since trigonometric functions are non-portable
Stanislav Malyshev [Sun, 26 Jan 2014 23:14:16 +0000 (15:14 -0800)]
drop precision since trigonometric functions are non-portable

See: http://stackoverflow.com/questions/21212326/floating-point-arithmetic-and-reproducibility

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Sun, 26 Jan 2014 23:12:19 +0000 (15:12 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  XFAIL multibyte tests until they are fixed (bug 66582)

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Sun, 26 Jan 2014 23:12:00 +0000 (15:12 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  XFAIL multibyte tests until they are fixed (bug 66582)

11 years agoXFAIL multibyte tests until they are fixed (bug 66582)
Stanislav Malyshev [Sun, 26 Jan 2014 23:11:15 +0000 (15:11 -0800)]
XFAIL multibyte tests until they are fixed (bug 66582)

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Sun, 26 Jan 2014 22:31:32 +0000 (14:31 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix test

11 years agofix test
Stanislav Malyshev [Sun, 26 Jan 2014 22:25:49 +0000 (14:25 -0800)]
fix test

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Sun, 26 Jan 2014 22:26:01 +0000 (14:26 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix test

11 years agofix test
Stanislav Malyshev [Sun, 26 Jan 2014 22:25:49 +0000 (14:25 -0800)]
fix test

11 years agofix test - new flag ZEND_ACC_HAS_TYPE_HINTS
Stanislav Malyshev [Sun, 26 Jan 2014 08:16:36 +0000 (00:16 -0800)]
fix test - new flag ZEND_ACC_HAS_TYPE_HINTS

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Derick Rethans [Sun, 26 Jan 2014 13:02:44 +0000 (14:02 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Derick Rethans [Sun, 26 Jan 2014 13:02:37 +0000 (14:02 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoMerge branch '45543-timezone-set' into PHP-5.4
Derick Rethans [Sun, 26 Jan 2014 13:02:19 +0000 (14:02 +0100)]
Merge branch '45543-timezone-set' into PHP-5.4

11 years agoFixed bug #45543: DateTime::setTimezone can not set timezones without ID.
Derick Rethans [Sun, 26 Jan 2014 12:58:13 +0000 (13:58 +0100)]
Fixed bug #45543: DateTime::setTimezone can not set timezones without ID.

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Sun, 26 Jan 2014 07:27:21 +0000 (23:27 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix test bug62479.phpt

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Sun, 26 Jan 2014 07:26:29 +0000 (23:26 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix test bug62479.phpt

11 years agofix test bug62479.phpt
Stanislav Malyshev [Sun, 26 Jan 2014 06:31:31 +0000 (22:31 -0800)]
fix test bug62479.phpt

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Sun, 26 Jan 2014 06:04:39 +0000 (22:04 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Implement ldap_modify_batch.

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Sun, 26 Jan 2014 06:01:15 +0000 (22:01 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Implement ldap_modify_batch.

Conflicts:
ext/ldap/ldap.c