]> 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
Lior Kaplan [Thu, 13 Mar 2014 10:43:15 +0000 (12:43 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Typo fix: sicret -> secret

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Lior Kaplan [Thu, 13 Mar 2014 10:41:48 +0000 (12:41 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Typo fix: sicret -> secret

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Lior Kaplan [Thu, 13 Mar 2014 10:40:14 +0000 (12:40 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Typo fix: sicret -> secret

11 years agoTypo fix: sicret -> secret
commit | commitdiff | tree
Michael Meyer [Thu, 13 Mar 2014 10:37:25 +0000 (12:37 +0200)]
Typo fix: sicret -> secret

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Anatol Belski [Thu, 13 Mar 2014 09:31:26 +0000 (10:31 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  updated libs_version.txt

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Anatol Belski [Thu, 13 Mar 2014 09:31:03 +0000 (10:31 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  updated libs_version.txt

Conflicts:
win32/build/libs_version.txt

11 years agoupdated libs_version.txt
commit | commitdiff | tree
Anatol Belski [Thu, 13 Mar 2014 09:28:04 +0000 (10:28 +0100)]
updated libs_version.txt

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Yasuo Ohgaki [Wed, 12 Mar 2014 21:55:10 +0000 (06:55 +0900)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Remove unneeded test

11 years agoRemove unneeded test
commit | commitdiff | tree
Yasuo Ohgaki [Wed, 12 Mar 2014 21:54:52 +0000 (06:54 +0900)]
Remove unneeded test

11 years agoUpdate NEWS
commit | commitdiff | tree
Yasuo Ohgaki [Wed, 12 Mar 2014 21:34:46 +0000 (06:34 +0900)]
Update NEWS

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Yasuo Ohgaki [Wed, 12 Mar 2014 21:33:28 +0000 (06:33 +0900)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Revert "Implement Bug #54649 Create session_serializer_name()"
  Revert "Implemented Request #11100 (session_gc() function)."

11 years agoRevert "Implement Bug #54649 Create session_serializer_name()"
commit | commitdiff | tree
Yasuo Ohgaki [Wed, 12 Mar 2014 21:32:49 +0000 (06:32 +0900)]
Revert "Implement Bug #54649 Create session_serializer_name()"

This reverts commit 678ec306557f61bf54b6df454387e7d9c3f50de5.

Conflicts:
ext/session/tests/session_serializer_name_basic.phpt

11 years agoRevert "Implemented Request #11100 (session_gc() function)."
commit | commitdiff | tree
Yasuo Ohgaki [Wed, 12 Mar 2014 21:30:32 +0000 (06:30 +0900)]
Revert "Implemented Request #11100 (session_gc() function)."

This reverts commit 54a42f0d0cf85fe0c032009b1f601427ae1c8566.

Conflicts:
ext/session/tests/session_gc_basic.phpt

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Anatol Belski [Wed, 12 Mar 2014 18:31:21 +0000 (19:31 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  made libgd recognize the 9 version series

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Anatol Belski [Wed, 12 Mar 2014 18:31:07 +0000 (19:31 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  made libgd recognize the 9 version series

11 years agomade libgd recognize the 9 version series
commit | commitdiff | tree
Anatol Belski [Wed, 12 Mar 2014 18:30:27 +0000 (19:30 +0100)]
made libgd recognize the 9 version series

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Anatol Belski [Wed, 12 Mar 2014 18:25:44 +0000 (19:25 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix include search

11 years agofix include search
commit | commitdiff | tree
Anatol Belski [Wed, 12 Mar 2014 18:25:20 +0000 (19:25 +0100)]
fix include search

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Remi Collet [Wed, 12 Mar 2014 16:13:55 +0000 (17:13 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS
  NEWS
  Fix bug  #66887 imagescale - poor quality of scaled image

11 years agoNEWS
commit | commitdiff | tree
Remi Collet [Wed, 12 Mar 2014 16:13:47 +0000 (17:13 +0100)]
NEWS

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Remi Collet [Wed, 12 Mar 2014 16:13:31 +0000 (17:13 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  Fix bug  #66887 imagescale - poor quality of scaled image

11 years agoNEWS
commit | commitdiff | tree
Remi Collet [Wed, 12 Mar 2014 16:13:24 +0000 (17:13 +0100)]
NEWS

11 years agoFix bug #66887 imagescale - poor quality of scaled image
commit | commitdiff | tree
Remi Collet [Wed, 12 Mar 2014 16:10:51 +0000 (17:10 +0100)]
Fix bug  #66887 imagescale - poor quality of scaled image

Issue with signed char overflow.

Upstream fix:
https://bitbucket.org/libgd/gd-libgd/commits/4b86e06937bc5ff116be969137f8da9d1a7869d5

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Remi Collet [Wed, 12 Mar 2014 14:36:52 +0000 (15:36 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS
  Fixed Bug #66893i imagescale ignore method argument

11 years agoNEWS
commit | commitdiff | tree
Remi Collet [Wed, 12 Mar 2014 14:36:38 +0000 (15:36 +0100)]
NEWS

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Remi Collet [Wed, 12 Mar 2014 14:36:08 +0000 (15:36 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed Bug #66893i imagescale ignore method argument

11 years agoFixed Bug #66893i imagescale ignore method argument
commit | commitdiff | tree
Remi Collet [Wed, 12 Mar 2014 14:33:41 +0000 (15:33 +0100)]
Fixed Bug #66893i imagescale ignore method argument

We also have our goto fail; bug.

Upstream fix for libgd
https://bitbucket.org/libgd/gd-libgd/commits/5b42b1178c37ffd30c9a15733058656be0277da0

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Nikita Popov [Wed, 12 Mar 2014 13:17:27 +0000 (14:17 +0100)]
Merge branch 'PHP-5.6'

11 years agoAdd SKIPIF in GMP test
commit | commitdiff | tree
Nikita Popov [Wed, 12 Mar 2014 13:11:19 +0000 (14:11 +0100)]
Add SKIPIF in GMP test

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Nikita Popov [Wed, 12 Mar 2014 13:16:58 +0000 (14:16 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

11 years agoFix hash_pbkdf2() with missing $length argument
commit | commitdiff | tree
Nikita Popov [Wed, 12 Mar 2014 13:09:34 +0000 (14:09 +0100)]
Fix hash_pbkdf2() with missing $length argument

Also change the type of some string length variables to ensure
that the zpp call works correctly on platforms where sizeof(int)
!= sizeof(long).

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Remi Collet [Wed, 12 Mar 2014 13:08:36 +0000 (14:08 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  typo in NEWS
  typo in NEWS

11 years agotypo in NEWS
commit | commitdiff | tree
Remi Collet [Wed, 12 Mar 2014 13:08:25 +0000 (14:08 +0100)]
typo in NEWS

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Remi Collet [Wed, 12 Mar 2014 13:08:09 +0000 (14:08 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  typo in NEWS

11 years agotypo in NEWS
commit | commitdiff | tree
Remi Collet [Wed, 12 Mar 2014 13:08:02 +0000 (14:08 +0100)]
typo in NEWS

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Remi Collet [Wed, 12 Mar 2014 12:47:36 +0000 (13:47 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS
  NEWS
  Fixed Bug #66890 imagescale segfault

11 years agoNEWS
commit | commitdiff | tree
Remi Collet [Wed, 12 Mar 2014 12:47:10 +0000 (13:47 +0100)]
NEWS

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Remi Collet [Wed, 12 Mar 2014 12:46:51 +0000 (13:46 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  Fixed Bug #66890 imagescale segfault

11 years agoNEWS
commit | commitdiff | tree
Remi Collet [Wed, 12 Mar 2014 12:46:29 +0000 (13:46 +0100)]
NEWS

11 years agoFixed Bug #66890 imagescale segfault
commit | commitdiff | tree
Remi Collet [Wed, 12 Mar 2014 12:44:58 +0000 (13:44 +0100)]
Fixed Bug #66890 imagescale segfault

zend_parse_parameters "l" expect long, not int

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Matteo Beccati [Wed, 12 Mar 2014 11:32:25 +0000 (12:32 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Updated UPGRADING to cover PDO_pgsql changes

11 years agoUpdated UPGRADING to cover PDO_pgsql changes
commit | commitdiff | tree
Matteo Beccati [Wed, 12 Mar 2014 11:31:04 +0000 (12:31 +0100)]
Updated UPGRADING to cover PDO_pgsql changes

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Matteo Beccati [Tue, 11 Mar 2014 22:30:18 +0000 (23:30 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Added new PDO::PGSQL_ATTR_DISABLE_PREPARES that uses PQexecParams
  Deprecated PDO::PGSQL_ATTR_DISABLE_NATIVE_PREPARED_STATEMENT
  Drop PDO support for extremely old libpq versions

11 years agoUpdated NEWS
commit | commitdiff | tree
Matteo Beccati [Tue, 11 Mar 2014 22:28:53 +0000 (23:28 +0100)]
Updated NEWS

11 years agoAdded new PDO::PGSQL_ATTR_DISABLE_PREPARES that uses PQexecParams
commit | commitdiff | tree
Matteo Beccati [Sun, 9 Mar 2014 13:08:17 +0000 (14:08 +0100)]
Added new PDO::PGSQL_ATTR_DISABLE_PREPARES that uses PQexecParams

Faster than prepared statements when queries are run once. Slightly
slower than PDO::ATTR_EMULATE_PREPARES but without the potential
security implications of embedding parameters in the query itself.

11 years agoDeprecated PDO::PGSQL_ATTR_DISABLE_NATIVE_PREPARED_STATEMENT
commit | commitdiff | tree
Matteo Beccati [Sun, 9 Mar 2014 11:14:23 +0000 (12:14 +0100)]
Deprecated PDO::PGSQL_ATTR_DISABLE_NATIVE_PREPARED_STATEMENT

11 years agoDrop PDO support for extremely old libpq versions
commit | commitdiff | tree
Matteo Beccati [Sun, 9 Mar 2014 10:43:13 +0000 (11:43 +0100)]
Drop PDO support for extremely old libpq versions

configure will now fail if any of the following function is missing:
* PQprepare
* PQexecParams
* PQescapeStringConn
* PQescapeByteaConn

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Adam Harvey [Tue, 11 Mar 2014 18:07:21 +0000 (11:07 -0700)]
Merge branch 'PHP-5.6'

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Adam Harvey [Tue, 11 Mar 2014 18:06:39 +0000 (11:06 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

11 years agoFix compile error with theoretically supported versions of libcurl < 7.12.3.
commit | commitdiff | tree
Adam Harvey [Tue, 11 Mar 2014 18:04:26 +0000 (11:04 -0700)]
Fix compile error with theoretically supported versions of libcurl < 7.12.3.

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Anatol Belski [Tue, 11 Mar 2014 15:29:53 +0000 (16:29 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix path separator

11 years agofix path separator
commit | commitdiff | tree
Anatol Belski [Tue, 11 Mar 2014 15:29:30 +0000 (16:29 +0100)]
fix path separator

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Nikita Popov [Tue, 11 Mar 2014 13:06:57 +0000 (14:06 +0100)]
Merge branch 'PHP-5.6'

11 years agoUse /dev/urandom as the default mcrypt_create_iv() source
commit | commitdiff | tree
Nikita Popov [Tue, 11 Mar 2014 12:42:16 +0000 (13:42 +0100)]
Use /dev/urandom as the default mcrypt_create_iv() source

Also fixes the ARGINFO for mcrypt_create_iv() and adds missing
UPGRADING entries.

11 years agoAdd tests for bug #66872 and gmp_[rem]root
commit | commitdiff | tree
Nikita Popov [Tue, 11 Mar 2014 12:28:26 +0000 (13:28 +0100)]
Add tests for bug #66872 and gmp_[rem]root

11 years agoFixed mcrypt test case
commit | commitdiff | tree
Tjerk Meesters [Sat, 8 Mar 2014 08:16:46 +0000 (16:16 +0800)]
Fixed mcrypt test case

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Tjerk Meesters [Tue, 11 Mar 2014 11:17:11 +0000 (19:17 +0800)]
Merge branch 'PHP-5.6'

11 years agoMerge branch 'php-5.5' into PHP-5.6
commit | commitdiff | tree
Tjerk Meesters [Tue, 11 Mar 2014 11:16:13 +0000 (19:16 +0800)]
Merge branch 'php-5.5' into PHP-5.6

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Tjerk Meesters [Tue, 11 Mar 2014 11:14:43 +0000 (19:14 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoRemoved bogus loops
commit | commitdiff | tree
Tjerk Meesters [Tue, 11 Mar 2014 09:52:20 +0000 (17:52 +0800)]
Removed bogus loops

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Anatol Belski [Tue, 11 Mar 2014 10:53:42 +0000 (11:53 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  restored the old code in 5.4/5 related to bug #66872

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Anatol Belski [Tue, 11 Mar 2014 10:53:17 +0000 (11:53 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  restored the old code in 5.4/5 related to bug #66872

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Anatol Belski [Tue, 11 Mar 2014 10:51:35 +0000 (11:51 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  restored the old code in 5.4/5 related to bug #66872

11 years agorestored the old code in 5.4/5 related to bug #66872
commit | commitdiff | tree
Anatol Belski [Tue, 11 Mar 2014 10:50:14 +0000 (11:50 +0100)]
restored the old code in 5.4/5 related to bug #66872

The crash is reproducable in 5.6+ only, so 5.4 and 5.5 are fine
with the old code.

11 years agoMerge branch 'master' of https://git.php.net/repository/php-src
commit | commitdiff | tree
Christopher Jones [Mon, 10 Mar 2014 23:46:43 +0000 (16:46 -0700)]
Merge branch 'master' of https://git.php.net/repository/php-src

# By Andrey Hristov (3) and Anatol Belski (1)
# Via Andrey Hristov (8) and others
* 'master' of https://git.php.net/repository/php-src:
  inject it directly. This is not C++ and I don't want to use hacks with similar structures that are binary compatible. Better be explicit.
  updated libsqlite to 3.8.3.1 in 5.5 branch, too
  DI
  Switch from a single flag to a flag byte

11 years agoMerge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6
commit | commitdiff | tree
Christopher Jones [Mon, 10 Mar 2014 23:46:42 +0000 (16:46 -0700)]
Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6

# By Pierre Joye (7) and others
# Via Pierre Joye (10) and others
* 'PHP-5.6' of https://git.php.net/repository/php-src:
  updated libsqlite to 3.8.3.1 in 5.5 branch, too
  DI
  Switch from a single flag to a flag byte
  update NEWS
  fix #66872, invalid argument crashes gmp_testbit
  fix #66872, invalid argument crashes gmp_testbit
  update news
  - fix #66869, Invalid 2nd argument crashes imageaffinematrixget
  add vc12 (2013)
  add vc12 (2013)

11 years agoMerge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
commit | commitdiff | tree
Christopher Jones [Mon, 10 Mar 2014 23:46:40 +0000 (16:46 -0700)]
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

# By Pierre Joye (7) and Anatol Belski (1)
# Via Pierre Joye (7) and Anatol Belski (1)
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  updated libsqlite to 3.8.3.1 in 5.5 branch, too
  update NEWS
  fix #66872, invalid argument crashes gmp_testbit
  fix #66872, invalid argument crashes gmp_testbit
  update news
  - fix #66869, Invalid 2nd argument crashes imageaffinematrixget
  add vc12 (2013)
  add vc12 (2013)

11 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
commit | commitdiff | tree
Christopher Jones [Mon, 10 Mar 2014 23:46:39 +0000 (16:46 -0700)]
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

# By Pierre Joye
# Via Pierre Joye
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  fix #66872, invalid argument crashes gmp_testbit
  fix #66872, invalid argument crashes gmp_testbit
  add vc12 (2013)

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Christopher Jones [Mon, 10 Mar 2014 23:34:21 +0000 (16:34 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed Bug #66875 (Improve performance of multi-row OCI_RETURN_LOB queries)

11 years agoFixed Bug #66875 (Improve performance of multi-row OCI_RETURN_LOB queries)
commit | commitdiff | tree
Christopher Jones [Mon, 10 Mar 2014 23:33:35 +0000 (16:33 -0700)]
Fixed Bug #66875 (Improve performance of multi-row OCI_RETURN_LOB queries)

11 years agoMerge branch 'master' of git.php.net:php-src
commit | commitdiff | tree
Andrey Hristov [Mon, 10 Mar 2014 17:24:29 +0000 (19:24 +0200)]
Merge branch 'master' of git.php.net:php-src

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Andrey Hristov [Mon, 10 Mar 2014 17:16:22 +0000 (19:16 +0200)]
Merge branch 'PHP-5.6'

11 years agoinject it directly. This is not C++ and I don't want to use hacks with similar structures
commit | commitdiff | tree
Andrey Hristov [Mon, 10 Mar 2014 17:15:30 +0000 (19:15 +0200)]
inject it directly. This is not C++ and I don't want to use hacks with similar structures
that are binary compatible. Better be explicit.

11 years agoMerge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
commit | commitdiff | tree
Anatol Belski [Mon, 10 Mar 2014 16:52:51 +0000 (17:52 +0100)]
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6

11 years agoMerge branch 'master' of git.php.net:php-src
commit | commitdiff | tree
Anatol Belski [Mon, 10 Mar 2014 16:52:32 +0000 (17:52 +0100)]
Merge branch 'master' of git.php.net:php-src

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Anatol Belski [Mon, 10 Mar 2014 16:51:05 +0000 (17:51 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  updated libsqlite to 3.8.3.1 in 5.5 branch, too

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Anatol Belski [Mon, 10 Mar 2014 16:50:45 +0000 (17:50 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  updated libsqlite to 3.8.3.1 in 5.5 branch, too

11 years agoupdated libsqlite to 3.8.3.1 in 5.5 branch, too
commit | commitdiff | tree
Anatol Belski [Mon, 10 Mar 2014 16:49:35 +0000 (17:49 +0100)]
updated libsqlite to 3.8.3.1 in 5.5 branch, too

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Andrey Hristov [Mon, 10 Mar 2014 16:19:22 +0000 (18:19 +0200)]
Merge branch 'PHP-5.6'

11 years agoDI
commit | commitdiff | tree
Andrey Hristov [Mon, 10 Mar 2014 16:18:56 +0000 (18:18 +0200)]
DI

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Andrey Hristov [Mon, 10 Mar 2014 15:52:48 +0000 (17:52 +0200)]
Merge branch 'PHP-5.6'

11 years agoMerge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
commit | commitdiff | tree
Andrey Hristov [Mon, 10 Mar 2014 15:34:18 +0000 (17:34 +0200)]
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6

11 years agoMerge branch 'master' of git.php.net:php-src
commit | commitdiff | tree
Andrey Hristov [Mon, 10 Mar 2014 15:34:08 +0000 (17:34 +0200)]
Merge branch 'master' of git.php.net:php-src

11 years agoMerge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
commit | commitdiff | tree
Pierre Joye [Mon, 10 Mar 2014 15:31:09 +0000 (16:31 +0100)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

# By Anatol Belski
# Via Anatol Belski
* 'PHP-5.4' of git.php.net:php-src:
  updated libmagic.patch

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
commit | commitdiff | tree
Pierre Joye [Mon, 10 Mar 2014 15:30:05 +0000 (16:30 +0100)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

# By Anatol Belski (1) and others
# Via Anatol Belski
* 'PHP-5.5' of git.php.net:php-src:
  updated libmagic.patch
  Fix indentation
  Do not remove *.1, it's not generated by make but configure

11 years agoMerge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
commit | commitdiff | tree
Pierre Joye [Mon, 10 Mar 2014 15:28:41 +0000 (16:28 +0100)]
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6

# By Anatol Belski (2) and others
# Via Anatol Belski (3) and others
* 'PHP-5.6' of git.php.net:php-src:
  updated libmagic.patch
  updated libmagic.patch
  Fix indentation
  Do not remove *.1, it's not generated by make but configure
  Fix typo: entory -> entry

11 years agoMerge branch 'master' of git.php.net:php-src
commit | commitdiff | tree
Pierre Joye [Mon, 10 Mar 2014 15:26:57 +0000 (16:26 +0100)]
Merge branch 'master' of git.php.net:php-src

# By Anatol Belski
# Via Anatol Belski
* 'master' of git.php.net:php-src:
  updated libmagic.patch
  updated libmagic.patch
  fix ZTS

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Andrey Hristov [Mon, 10 Mar 2014 15:26:13 +0000 (17:26 +0200)]
Merge branch 'PHP-5.6'

11 years agoSwitch from a single flag to a flag byte
commit | commitdiff | tree
Andrey Hristov [Mon, 10 Mar 2014 15:25:53 +0000 (17:25 +0200)]
Switch from a single flag to a flag byte

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Anatol Belski [Mon, 10 Mar 2014 13:18:06 +0000 (14:18 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  updated libmagic.patch
  updated libmagic.patch

11 years agoupdated libmagic.patch
commit | commitdiff | tree
Anatol Belski [Mon, 10 Mar 2014 13:17:47 +0000 (14:17 +0100)]
updated libmagic.patch

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Anatol Belski [Mon, 10 Mar 2014 13:14:01 +0000 (14:14 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  updated libmagic.patch

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Anatol Belski [Mon, 10 Mar 2014 13:13:15 +0000 (14:13 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  updated libmagic.patch

11 years agoupdated libmagic.patch
commit | commitdiff | tree
Anatol Belski [Mon, 10 Mar 2014 13:12:20 +0000 (14:12 +0100)]
updated libmagic.patch

11 years agofix ZTS
commit | commitdiff | tree
Anatol Belski [Mon, 10 Mar 2014 11:24:32 +0000 (12:24 +0100)]
fix ZTS

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Pierre Joye [Mon, 10 Mar 2014 11:19:36 +0000 (12:19 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  update NEWS
  fix #66872, invalid argument crashes gmp_testbit
  fix #66872, invalid argument crashes gmp_testbit
  add vc12 (2013)

11 years agoMerge branch 'master' of git.php.net:php-src
commit | commitdiff | tree
Pierre Joye [Mon, 10 Mar 2014 11:19:32 +0000 (12:19 +0100)]
Merge branch 'master' of git.php.net:php-src

# By Andrey Hristov (1) and others
# Via Andrey Hristov (3) and others
* 'master' of git.php.net:php-src:
  Fix indentation
  Do not remove *.1, it's not generated by make but configure
  Fix typo: entory -> entry

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Pierre Joye [Mon, 10 Mar 2014 11:18:57 +0000 (12:18 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update NEWS
  fix #66872, invalid argument crashes gmp_testbit
  fix #66872, invalid argument crashes gmp_testbit
  add vc12 (2013)

Conflicts:
ext/gmp/gmp.c

11 years agoupdate NEWS
commit | commitdiff | tree
Pierre Joye [Mon, 10 Mar 2014 11:12:46 +0000 (12:12 +0100)]
update NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Pierre Joye [Mon, 10 Mar 2014 11:10:57 +0000 (12:10 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix #66872, invalid argument crashes gmp_testbit
  fix #66872, invalid argument crashes gmp_testbit
  add vc12 (2013)

Conflicts:
win32/build/confutils.js

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