]> granicus.if.org Git - php/log
projects / php / log
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
php
11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Anatol Belski [Thu, 6 Feb 2014 08:18:22 +0000 (09:18 +0100)]
Merge branch 'PHP-5.6'

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

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
Anatol Belski [Thu, 6 Feb 2014 08:15:28 +0000 (09:15 +0100)]
updated libs_version.txt

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

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

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Anatol Belski [Wed, 5 Feb 2014 19:14:19 +0000 (20:14 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  more tests for ICU >= 52.1 compat
  fix tests for ICU >= 52.1

11 years agomore tests for ICU >= 52.1 compat
commit | commitdiff | tree
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
commit | commitdiff | tree
Anatol Belski [Wed, 5 Feb 2014 18:16:14 +0000 (19:16 +0100)]
fix tests for ICU >= 52.1

11 years agofix tests for ICU >= 52.1
commit | commitdiff | tree
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.6'
commit | commitdiff | tree
Hannes Magnusson [Wed, 5 Feb 2014 18:18:10 +0000 (10:18 -0800)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix year

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
Hannes Magnusson [Wed, 5 Feb 2014 18:15:11 +0000 (10:15 -0800)]
Fix year

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Anatol Belski [Wed, 5 Feb 2014 14:17:48 +0000 (15:17 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  adapt test to curl 7.35.0 upgrade

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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.6'
commit | commitdiff | tree
Anatol Belski [Wed, 5 Feb 2014 09:52:17 +0000 (10:52 +0100)]
Merge branch 'PHP-5.6'

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

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
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
commit | commitdiff | tree
Anatol Belski [Wed, 5 Feb 2014 09:51:08 +0000 (10:51 +0100)]
move the NEWS entry into the right section

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Daniel Lowrey [Wed, 5 Feb 2014 02:13:50 +0000 (19:13 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed SNI failure from missing Z_STRVAL_PP

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

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Anatol Belski [Tue, 4 Feb 2014 09:39:46 +0000 (10:39 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  updated NEWS
  updated NEWS

11 years agoupdated NEWS
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
Anatol Belski [Tue, 4 Feb 2014 09:38:17 +0000 (10:38 +0100)]
updated NEWS

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Anatol Belski [Tue, 4 Feb 2014 09:35:19 +0000 (10:35 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  pcre tests go with 8.34 upgrade

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
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
commit | commitdiff | tree
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.6'
commit | commitdiff | tree
Anatol Belski [Tue, 4 Feb 2014 09:32:09 +0000 (10:32 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  pcre upgraded to 8.34

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
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
commit | commitdiff | tree
Anatol Belski [Tue, 4 Feb 2014 09:31:07 +0000 (10:31 +0100)]
pcre upgraded to 8.34

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Ferenc Kovacs [Mon, 3 Feb 2014 03:21:27 +0000 (04:21 +0100)]
Merge branch 'PHP-5.6'

11 years agomention the openssl SPKAC functions commited to master before branching out 5.6....
commit | commitdiff | tree
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 agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
krakjoe [Sun, 2 Feb 2014 15:14:53 +0000 (15:14 +0000)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  windows

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

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
krakjoe [Sun, 2 Feb 2014 15:10:28 +0000 (15:10 +0000)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  clean symbols

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

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
krakjoe [Sun, 2 Feb 2014 14:59:30 +0000 (14:59 +0000)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  another patch from upstream

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

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
krakjoe [Sun, 2 Feb 2014 14:50:43 +0000 (14:50 +0000)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  woops

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

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
krakjoe [Sun, 2 Feb 2014 14:42:54 +0000 (14:42 +0000)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  better use of tmpnam/mkstemp

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

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
krakjoe [Sun, 2 Feb 2014 14:05:03 +0000 (14:05 +0000)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  update version

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

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
krakjoe [Sun, 2 Feb 2014 13:51:05 +0000 (13:51 +0000)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  remove use of zend directly, avoid leaks/bugs in modules etc

11 years agoMerge branch 'master' of https://git.php.net/repository/php-src
commit | commitdiff | tree
krakjoe [Sun, 2 Feb 2014 13:50:54 +0000 (13:50 +0000)]
Merge branch 'master' of https://git.php.net/repository/php-src

11 years agoremove use of zend directly, avoid leaks/bugs in modules etc
commit | commitdiff | tree
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
commit | commitdiff | tree
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 agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Daniel Lowrey [Sat, 1 Feb 2014 15:25:01 +0000 (08:25 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Remove #if PHP_VERSION_ID version checks

Conflicts:
ext/openssl/xp_ssl.c

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

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

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Daniel Lowrey [Fri, 31 Jan 2014 21:22:35 +0000 (14:22 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Use master-agnostic zend_is_true checks

Conflicts:
ext/openssl/xp_ssl.c

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

11 years agofix ZTS build
commit | commitdiff | tree
Anatol Belski [Thu, 30 Jan 2014 09:47:58 +0000 (10:47 +0100)]
fix ZTS build

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Stanislav Malyshev [Thu, 30 Jan 2014 07:48:44 +0000 (23:48 -0800)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  tests still failing, so xfail for now until fixed
  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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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.6'
commit | commitdiff | tree
Yasuo Ohgaki [Thu, 30 Jan 2014 05:17:11 +0000 (14:17 +0900)]
Merge branch 'PHP-5.6'

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

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
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
commit | commitdiff | tree
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.
commit | commitdiff | tree
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 agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Daniel Lowrey [Thu, 30 Jan 2014 00:59:46 +0000 (17:59 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed build breakage from b4b4d9697f

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

11 years agofix merge error after b4b4d9697fa43a526466165a3ca89d058296cb04
commit | commitdiff | tree
Anatol Belski [Wed, 29 Jan 2014 21:50:56 +0000 (22:50 +0100)]
fix merge error after b4b4d9697fa43a526466165a3ca89d058296cb04

11 years agoMerge branch 'master' of git.php.net:php-src
commit | commitdiff | tree
Andrey Hristov [Wed, 29 Jan 2014 13:33:52 +0000 (15:33 +0200)]
Merge branch 'master' of git.php.net:php-src

Conflicts:
ext/openssl/xp_ssl.c

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Andrey Hristov [Wed, 29 Jan 2014 13:32:02 +0000 (15:32 +0200)]
Merge branch 'PHP-5.6'

Conflicts:
NEWS
ext/openssl/xp_ssl.c

11 years agoMerge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
commit | commitdiff | tree
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
commit | commitdiff | tree
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 agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Remi Collet [Wed, 29 Jan 2014 13:01:03 +0000 (14:01 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  zip extension version 1.12.4

11 years agozip extension version 1.12.4
commit | commitdiff | tree
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.6'
commit | commitdiff | tree
Remi Collet [Wed, 29 Jan 2014 08:57:22 +0000 (09:57 +0100)]
Merge branch 'PHP-5.6'

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

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
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
commit | commitdiff | tree
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.6'
commit | commitdiff | tree
Yasuo Ohgaki [Wed, 29 Jan 2014 06:56:13 +0000 (15:56 +0900)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed zend.multibyte tests partially

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
Yasuo Ohgaki [Wed, 29 Jan 2014 06:41:30 +0000 (15:41 +0900)]
Fixed zend.multibyte tests partially

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Daniel Lowrey [Tue, 28 Jan 2014 17:36:28 +0000 (10:36 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Update NEWS/UPGRADING
  Verify peers by default in client socket operations

Conflicts:
ext/openssl/xp_ssl.c

11 years agoUpdate NEWS/UPGRADING
commit | commitdiff | tree
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
commit | commitdiff | tree
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 'master' of https://github.com/php/php-src
commit | commitdiff | tree
Daniel Lowrey [Tue, 28 Jan 2014 16:53:17 +0000 (09:53 -0700)]
Merge branch 'master' of https://github.com/php/php-src

* 'master' of https://github.com/php/php-src:
  add text for the new constants
  add new consts

11 years agoMerge branch 'master' of git.php.net:php-src
commit | commitdiff | tree
Andrey Hristov [Tue, 28 Jan 2014 13:58:08 +0000 (15:58 +0200)]
Merge branch 'master' of git.php.net:php-src

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Andrey Hristov [Tue, 28 Jan 2014 13:57:48 +0000 (15:57 +0200)]
Merge branch 'PHP-5.6'

Conflicts:
NEWS
UPGRADING

11 years agoMerge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
commit | commitdiff | tree
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.6'
commit | commitdiff | tree
Andrey Hristov [Tue, 28 Jan 2014 13:47:50 +0000 (15:47 +0200)]
Merge branch 'PHP-5.6'

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
Andrey Hristov [Tue, 28 Jan 2014 13:23:41 +0000 (15:23 +0200)]
add new consts

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Bob Weinand [Tue, 28 Jan 2014 12:35:13 +0000 (13:35 +0100)]
Merge branch 'PHP-5.6'

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

next
Unnamed repository; edit this file 'description' to name the repository.