]> granicus.if.org Git - php/log
php
10 years agoFixed typo in UPGRADING and modified php.ini-* description for encoding related changes
Yasuo Ohgaki [Mon, 17 Mar 2014 22:27:45 +0000 (07:27 +0900)]
Fixed typo in UPGRADING and modified php.ini-* description for encoding related changes

10 years agoAdd support for PCRE marks
Nikita Popov [Fri, 28 Feb 2014 16:14:26 +0000 (17:14 +0100)]
Add support for PCRE marks

If a MARK is set then it will be returned in the $matches array
unter key "MARK". If no MARK is used or passed, the key will not
be set.

10 years agoUpdate UPGRADING.
Yasuo Ohgaki [Mon, 17 Mar 2014 20:45:01 +0000 (05:45 +0900)]
Update UPGRADING.
Add more descriptions about default_charset and encoding related changes.
Many thanks to Christopher.

10 years agoUPGRADING (openssl updates)
Daniel Lowrey [Mon, 17 Mar 2014 14:03:40 +0000 (08:03 -0600)]
UPGRADING (openssl updates)

10 years agoMerge branch 'pgsql-async' into PHP-5.6
Daniel Lowrey [Mon, 17 Mar 2014 12:45:37 +0000 (06:45 -0600)]
Merge branch 'pgsql-async' into PHP-5.6

* pgsql-async:
  Support async pgsql connections and non-blocking queries

10 years agoSupport async pgsql connections and non-blocking queries
Daniel Lowrey [Thu, 13 Mar 2014 18:55:33 +0000 (12:55 -0600)]
Support async pgsql connections and non-blocking queries

- New functions (each accepts a pgsql $connection resource):

  . pg_connect_poll
  . pg_socket
  . pg_consume_input
  . pg_flush

- Modified functions

  The following functions now additionally return zero if the
  underlying socket is set to non-blocking mode and the send
  operation does not complete immediately. Previously these
  functions returned only boolean TRUE/FALSE and blocked
  execution while polling until all data was sent:

  . pg_send_execute
  . pg_send_prepare
  . pg_send_query
  . pg_send_query_params

- New constants

  Used with pg_connect() to initiate an asynchronous connection
  attempt:

  . PGSQL_CONNECT_ASYNC

  Used with pg_connection_status() to determine the current state
  of an async connection attempt:

  . PGSQL_CONNECTION_STARTED
  . PGSQL_CONNECTION_MADE
  . PGSQL_CONNECTION_AWAITING_RESPONSE
  . PGSQL_CONNECTION_AUTH_OK
  . PGSQL_CONNECTION_SSL_STARTUP
  . PGSQL_CONNECTION_SETENV

  Used with pg_connect_poll() to determine the result of an
  async connection attempt:

  . PGSQL_POLLING_FAILED
  . PGSQL_POLLING_READING
  . PGSQL_POLLING_WRITING
  . PGSQL_POLLING_OK
  . PGSQL_POLLING_ACTIVE

- Polling via returned pg_socket() stream

  pg_socket() returns a read-only socket stream that may be
  cast to a file descriptor for select (and similar) polling
  operations. Blocking behavior of the pgsql connection socket
  can be controlled by calling stream_set_blocking() on the
  stream returned by pg_socket().

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Mon, 17 Mar 2014 08:19:45 +0000 (01:19 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix bug #66873: check if obj->src is set

10 years agoFix bug #66873: check if obj->src is set
Stanislav Malyshev [Mon, 17 Mar 2014 08:17:09 +0000 (01:17 -0700)]
Fix bug #66873: check if obj->src is set

10 years agoupdated NEWS
Anatol Belski [Sat, 15 Mar 2014 17:00:16 +0000 (18:00 +0100)]
updated NEWS

10 years agoupdated to oniguruma to 5.9.5
Anatol Belski [Sat, 15 Mar 2014 16:56:04 +0000 (17:56 +0100)]
updated to oniguruma to 5.9.5

10 years agoNEWS
Remi Collet [Fri, 14 Mar 2014 08:53:11 +0000 (09:53 +0100)]
NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Remi Collet [Fri, 14 Mar 2014 08:52:47 +0000 (09:52 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  NEWS
  Fixed Bug #66833 Default digest algo is still MD5
  Fix 5.5.10 NEWS

10 years agoNEWS
Remi Collet [Fri, 14 Mar 2014 08:52:37 +0000 (09:52 +0100)]
NEWS

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Remi Collet [Fri, 14 Mar 2014 08:52:02 +0000 (09:52 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  NEWS
  Fixed Bug #66833 Default digest algo is still MD5

10 years agoNEWS
Remi Collet [Fri, 14 Mar 2014 08:51:53 +0000 (09:51 +0100)]
NEWS

10 years agoFixed Bug #66833 Default digest algo is still MD5
Remi Collet [Fri, 14 Mar 2014 08:50:15 +0000 (09:50 +0100)]
Fixed Bug #66833 Default digest algo is still MD5

Switch to SHA1, which match internal openssl hardcoded algo.

In most case, won't even be noticed
- priority on user input (default_md)
- fallback on system config
- fallback on this default value

Recent system reject MD5 digest, noticed in bug36732.phpt failure.

While SHA1 is better than MD5, SHA256 is recommenced,
and defined as default algo in provided configuration on
recent system (Fedora 21, RHEL-7, ...). But the idea is to
keep in sync with openssl internal value for PHP internal value.

10 years agoFix 5.5.10 NEWS
David Zülke [Thu, 13 Mar 2014 15:51:44 +0000 (16:51 +0100)]
Fix 5.5.10 NEWS

The FPM change didn't make it into 5.5.10 but will instead be in 5.5.11; http://php.net/Changelog-5.php, the release and the NEWS file in the release accurately reflect this, but the 5.5 branch NEWS doesn't (as the release was made and tagged from the last RC, which didn't contain that change yet).

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

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

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

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

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

10 years agoUpdate NEWS
Yasuo Ohgaki [Wed, 12 Mar 2014 21:34:46 +0000 (06:34 +0900)]
Update NEWS

10 years agoRevert "Implement Bug #54649 Create session_serializer_name()"
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

10 years agoRevert "Implemented Request #11100 (session_gc() function)."
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

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

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

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

10 years agoNEWS
Remi Collet [Wed, 12 Mar 2014 16:13:47 +0000 (17:13 +0100)]
NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

10 years agoNEWS
Remi Collet [Wed, 12 Mar 2014 16:13:24 +0000 (17:13 +0100)]
NEWS

10 years agoFix bug #66887 imagescale - poor quality of scaled image
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

10 years agoNEWS
Remi Collet [Wed, 12 Mar 2014 14:36:38 +0000 (15:36 +0100)]
NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

10 years agoFixed Bug #66893i imagescale ignore method argument
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

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

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

10 years agoFix hash_pbkdf2() with missing $length argument
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).

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

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

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

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

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

10 years agoNEWS
Remi Collet [Wed, 12 Mar 2014 12:46:29 +0000 (13:46 +0100)]
NEWS

10 years agoFixed Bug #66890 imagescale segfault
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

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

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

10 years agoAdded new PDO::PGSQL_ATTR_DISABLE_PREPARES that uses PQexecParams
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.

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

10 years agoDrop PDO support for extremely old libpq versions
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

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

10 years agoFix compile error with theoretically supported versions of libcurl < 7.12.3.
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.

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

10 years agoUse /dev/urandom as the default mcrypt_create_iv() source
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.

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

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

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

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

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

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

10 years agorestored the old code in 5.4/5 related to bug #66872
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.

10 years agoMerge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6
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)

10 years agoMerge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
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)

10 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
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)

10 years agoFixed Bug #66875 (Improve performance of multi-row OCI_RETURN_LOB queries)
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)

10 years agoMerge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
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

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

10 years agoupdated libsqlite to 3.8.3.1 in 5.5 branch, too
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

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

10 years agoMerge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
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

10 years agoMerge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
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

10 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
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

10 years agoMerge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
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

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

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

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

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

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

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

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

10 years agofix #66872, invalid argument crashes gmp_testbit
Pierre Joye [Mon, 10 Mar 2014 11:07:58 +0000 (12:07 +0100)]
fix #66872, invalid argument crashes gmp_testbit

10 years agofix #66872, invalid argument crashes gmp_testbit
Pierre Joye [Mon, 10 Mar 2014 11:06:40 +0000 (12:06 +0100)]
fix #66872, invalid argument crashes gmp_testbit

10 years agoMerge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
Pierre Joye [Mon, 10 Mar 2014 11:04:04 +0000 (12:04 +0100)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

# By Dmitry Panin (1) and Remi Collet (1)
# Via Nikita Popov
* 'PHP-5.4' of git.php.net:php-src:
  Fix HTML entity table generation
  Set default Digest Message to use SHA1 instead of MD5 in openssl tests as MD5 signature are now rejected by newer openssl Version.

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Andrey Hristov [Mon, 10 Mar 2014 10:53:17 +0000 (12:53 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

10 years agoFix indentation
Andrey Hristov [Mon, 10 Mar 2014 10:52:56 +0000 (12:52 +0200)]
Fix indentation

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Mon, 10 Mar 2014 07:55:05 +0000 (15:55 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6

10 years agoDo not remove *.1, it's not generated by make but configure
Xinchen Hui [Mon, 10 Mar 2014 07:54:20 +0000 (15:54 +0800)]
Do not remove *.1, it's not generated by make but configure

10 years agoFix typo: entory -> entry
Lior Kaplan [Sun, 9 Mar 2014 20:58:04 +0000 (22:58 +0200)]
Fix typo: entory -> entry

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Pierre Joye [Sun, 9 Mar 2014 20:17:06 +0000 (21:17 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update news
  - fix #66869, Invalid 2nd argument crashes imageaffinematrixget
  add vc12 (2013)

Conflicts:
win32/build/confutils.js

10 years agoupdate news
Pierre Joye [Sun, 9 Mar 2014 20:13:15 +0000 (21:13 +0100)]
update news

10 years ago- fix #66869, Invalid 2nd argument crashes imageaffinematrixget
Pierre Joye [Sun, 9 Mar 2014 20:12:19 +0000 (21:12 +0100)]
- fix #66869, Invalid 2nd argument crashes imageaffinematrixget

10 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Pierre Joye [Sun, 9 Mar 2014 20:11:19 +0000 (21:11 +0100)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

# By Remi Collet (6) and others
# Via Nikita Popov (1) and others
* 'PHP-5.5' of git.php.net:php-src:
  Fixed null termination
  Updated NEWS for #65545
  Add fread(length) method
  Fix HTML entity table generation
  Fix order in NEWS
  Add CVE ref (not known at release time)
  Fix NEWS for 5.5.11 fix (really not in 5.5.10)
  5.5.10 release date for NEWS
  Set default Digest Message to use SHA1 instead of MD5 in openssl tests as MD5 signature are now rejected by newer openssl Version.
  NEWS
  Fixed Bug #66815 imagecrop(): insufficient fix for NULL defer CVE-2013-7327

10 years agoupdated NEWS
Anatol Belski [Sun, 9 Mar 2014 12:06:32 +0000 (13:06 +0100)]
updated NEWS

10 years agoremoved the libsqlite patch as it's not relevant anymore
Anatol Belski [Sun, 9 Mar 2014 12:03:43 +0000 (13:03 +0100)]
removed the libsqlite patch as it's not relevant anymore

10 years agoupdated bundled libsqlite to 3.8.3.1
Anatol Belski [Sun, 9 Mar 2014 12:01:48 +0000 (13:01 +0100)]
updated bundled libsqlite to 3.8.3.1

10 years agoadd OPSYS_Z_CPM missing constant
Remi Collet [Fri, 7 Mar 2014 13:10:16 +0000 (14:10 +0100)]
add OPSYS_Z_CPM missing constant

10 years agoUpdate php.ini files (new openssl directives)
Daniel Lowrey [Fri, 7 Mar 2014 12:26:37 +0000 (05:26 -0700)]
Update php.ini files (new openssl directives)