]>
granicus.if.org Git - php/log
Matteo Beccati [Mon, 5 Jan 2015 11:12:02 +0000 (12:12 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Update test after fixing bug #68371
Matteo Beccati [Mon, 5 Jan 2015 11:11:46 +0000 (12:11 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Update test after fixing bug #68371
Matteo Beccati [Mon, 5 Jan 2015 11:11:16 +0000 (12:11 +0100)]
Update test after fixing bug #68371
Matteo Beccati [Mon, 5 Jan 2015 10:03:50 +0000 (11:03 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Updated NEWS for #68371
Ref #68371 - Added support for PDO::PGSQL_ATTR_DISABLE_PREPARES
Matteo Beccati [Mon, 5 Jan 2015 10:02:52 +0000 (11:02 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Updated NEWS for #68371
Matteo Beccati [Mon, 5 Jan 2015 10:01:54 +0000 (11:01 +0100)]
Updated NEWS for #68371
Matteo Beccati [Mon, 5 Jan 2015 10:00:11 +0000 (11:00 +0100)]
Ref #68371 - Added support for PDO::PGSQL_ATTR_DISABLE_PREPARES
Matteo Beccati [Mon, 5 Jan 2015 09:48:40 +0000 (10:48 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific attribute names
Matteo Beccati [Mon, 5 Jan 2015 08:54:06 +0000 (09:54 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific attribute names
Matteo Beccati [Mon, 5 Jan 2015 08:25:48 +0000 (09:25 +0100)]
Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific attribute names
Xinchen Hui [Mon, 5 Jan 2015 05:26:33 +0000 (00:26 -0500)]
Merge branch 'master' of https://git.php.net/repository/php-src
Xinchen Hui [Mon, 5 Jan 2015 05:26:10 +0000 (00:26 -0500)]
Revert "Fix memory leak when dereferencing reference with refcount 1"
This reverts commit
f4cb5cc09d44e6940fecebe52b8013b288ed67c4.
breaks tests Zend/tests/bug27268.phpt and Zend/tests/bug68262.phpt
Stanislav Malyshev [Mon, 5 Jan 2015 05:08:24 +0000 (21:08 -0800)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix memory leak
Stanislav Malyshev [Mon, 5 Jan 2015 05:08:16 +0000 (21:08 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix memory leak
Stanislav Malyshev [Mon, 5 Jan 2015 05:07:57 +0000 (21:07 -0800)]
fix memory leak
Stanislav Malyshev [Mon, 5 Jan 2015 04:55:25 +0000 (20:55 -0800)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixes #66764 - configure doesn't define EXPANDED_DATADIR / PHP_DATADIR correctly
Stanislav Malyshev [Mon, 5 Jan 2015 04:54:46 +0000 (20:54 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixes #66764 - configure doesn't define EXPANDED_DATADIR / PHP_DATADIR correctly
Stanislav Malyshev [Mon, 5 Jan 2015 04:46:40 +0000 (20:46 -0800)]
Merge branch 'pull-request/975' into PHP-5.5
* pull-request/975:
Fixes #66764 - configure doesn't define EXPANDED_DATADIR / PHP_DATADIR correctly
Stanislav Malyshev [Mon, 5 Jan 2015 03:57:46 +0000 (19:57 -0800)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix GD tests with no GD loaded
Fixed typo
GD: imagepalettetotruecolor tests
Stanislav Malyshev [Mon, 5 Jan 2015 03:57:29 +0000 (19:57 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix GD tests with no GD loaded
Fixed typo
GD: imagepalettetotruecolor tests
Stanislav Malyshev [Mon, 5 Jan 2015 03:46:33 +0000 (19:46 -0800)]
Merge branch 'pull-request/742' into PHP-5.5
* pull-request/742:
Fixed typo
GD: imagepalettetotruecolor tests
Stanislav Malyshev [Mon, 5 Jan 2015 03:45:57 +0000 (19:45 -0800)]
fix GD tests with no GD loaded
Gustavo Frederico Temple Pedrosa [Tue, 16 Dec 2014 19:10:32 +0000 (19:10 +0000)]
Specifying MACRO for ppc64
Add PowerPC64 too, which is capable to access unaligned words.
Chris Christoff [Sat, 6 Dec 2014 01:59:07 +0000 (20:59 -0500)]
Formatting fixes for git rules file
Formatting fixes for git rules file
This commit fixes 2 issues with the git rules
file. First, a typo of "::" has been changed to
":". Second, an extraneous space has been
removed.
Xinchen Hui [Mon, 5 Jan 2015 03:08:35 +0000 (22:08 -0500)]
Still -1 on *BSD now
Xinchen Hui [Mon, 5 Jan 2015 03:04:32 +0000 (22:04 -0500)]
Stanislav Malyshev [Mon, 5 Jan 2015 03:00:05 +0000 (19:00 -0800)]
Merge branch 'pull-request/731'
* pull-request/731:
Set FPM_BACKLOG_DEFAULT to 511
Bob Weinand [Sun, 4 Jan 2015 23:28:53 +0000 (00:28 +0100)]
Fix memory leak when dereferencing reference with refcount 1
Nikita Popov [Sun, 4 Jan 2015 17:07:44 +0000 (18:07 +0100)]
Add missing string cast for non-cv var fetches
Nikita Popov [Sun, 4 Jan 2015 16:57:23 +0000 (17:57 +0100)]
Fix use after free for variables with integer names
Anatol Belski [Sun, 4 Jan 2015 16:09:06 +0000 (17:09 +0100)]
updated libmagic.patch
Anatol Belski [Sun, 4 Jan 2015 16:08:15 +0000 (17:08 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated libmagic.patch in 5.6
updated libmagic.patch in 5.5
updated libmagic.patch in 5.4
Anatol Belski [Sun, 4 Jan 2015 16:07:32 +0000 (17:07 +0100)]
updated libmagic.patch in 5.6
Anatol Belski [Sun, 4 Jan 2015 16:06:15 +0000 (17:06 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated libmagic.patch in 5.5
updated libmagic.patch in 5.4
Anatol Belski [Sun, 4 Jan 2015 16:05:42 +0000 (17:05 +0100)]
updated libmagic.patch in 5.5
Anatol Belski [Sun, 4 Jan 2015 16:04:53 +0000 (17:04 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
updated libmagic.patch in 5.4
Anatol Belski [Sun, 4 Jan 2015 16:04:13 +0000 (17:04 +0100)]
updated libmagic.patch in 5.4
Anatol Belski [Sun, 4 Jan 2015 13:25:28 +0000 (14:25 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
updated NEWS
Fixed bug #68735 fileinfo out-of-bounds memory access
Anatol Belski [Sun, 4 Jan 2015 13:24:59 +0000 (14:24 +0100)]
updated NEWS
Anatol Belski [Sun, 4 Jan 2015 13:23:56 +0000 (14:23 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated NEWS
Fixed bug #68735 fileinfo out-of-bounds memory access
Anatol Belski [Sun, 4 Jan 2015 13:23:33 +0000 (14:23 +0100)]
updated NEWS
Anatol Belski [Sun, 4 Jan 2015 13:22:37 +0000 (14:22 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed bug #68735 fileinfo out-of-bounds memory access
Anatol Belski [Sun, 4 Jan 2015 13:20:21 +0000 (14:20 +0100)]
Fixed bug #68735 fileinfo out-of-bounds memory access
Anatol Belski [Sun, 4 Jan 2015 08:43:33 +0000 (09:43 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
removed dead code
Anatol Belski [Sun, 4 Jan 2015 08:42:46 +0000 (09:42 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
removed dead code
Conflicts:
ext/fileinfo/libmagic/readelf.c
ext/fileinfo/libmagic/readelf.h
Anatol Belski [Sun, 4 Jan 2015 08:40:56 +0000 (09:40 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
removed dead code
Remi Collet [Sun, 4 Jan 2015 08:40:19 +0000 (09:40 +0100)]
removed dead code
Stanislav Malyshev [Sun, 4 Jan 2015 05:55:29 +0000 (21:55 -0800)]
Fix bug #68706 - uninitalized pointer in mbstring
Ferenc Kovacs [Sat, 3 Jan 2015 18:18:07 +0000 (19:18 +0100)]
Fixes #66764 - configure doesn't define EXPANDED_DATADIR / PHP_DATADIR correctly
Remi Collet [Sat, 3 Jan 2015 07:34:27 +0000 (08:34 +0100)]
Fix Bug #68713 infinite loop / infinite free
PHP not affected (emalloc never return NULL)
Just to reduce diff with upstream and for legibility
Apply:
https://bitbucket.org/libgd/gd-libgd/commits/
3c0d2203b2672b688d4d2326ff3a60b019879062
https://bitbucket.org/libgd/gd-libgd/commits/
4af76c97a478d4e7c4b64e08ac67abbca7cbd0fb
Ferenc Kovacs [Fri, 2 Jan 2015 09:16:37 +0000 (10:16 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixes #67960 - Long/short day names reversed in jddayofweek()
Conflicts:
ext/calendar/calendar.c
Ferenc Kovacs [Fri, 2 Jan 2015 09:15:01 +0000 (10:15 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixes #67960 - Long/short day names reversed in jddayofweek()
Greg Roach [Thu, 4 Sep 2014 21:29:26 +0000 (22:29 +0100)]
Fixes #67960 - Long/short day names reversed in jddayofweek()
Anatol Belski [Wed, 31 Dec 2014 13:47:14 +0000 (14:47 +0100)]
cleanup redundand macros
Sara Golemon [Tue, 30 Dec 2014 21:54:02 +0000 (13:54 -0800)]
Allow the third arg to DateTime(Immutable)::createFromFormat() to be null.
Permit the same meaning as not passing the arg at all.
Anatol Belski [Tue, 30 Dec 2014 19:28:52 +0000 (20:28 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated libmagic.patch
updated libmagic.patch
Anatol Belski [Tue, 30 Dec 2014 19:28:13 +0000 (20:28 +0100)]
updated libmagic.patch
Anatol Belski [Tue, 30 Dec 2014 19:22:51 +0000 (20:22 +0100)]
updated libmagic.patch
Anatol Belski [Tue, 30 Dec 2014 19:22:08 +0000 (20:22 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated libmagic.patch
Anatol Belski [Tue, 30 Dec 2014 19:21:28 +0000 (20:21 +0100)]
updated libmagic.patch
Anatol Belski [Tue, 30 Dec 2014 18:41:07 +0000 (19:41 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
Fixed bug #68671 incorrect expression in libmagic
Conflicts:
ext/fileinfo/libmagic/print.c
Anatol Belski [Tue, 30 Dec 2014 18:39:14 +0000 (19:39 +0100)]
updated NEWS
Anatol Belski [Tue, 30 Dec 2014 18:38:08 +0000 (19:38 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #68671 incorrect expression in libmagic
Anatol Belski [Tue, 30 Dec 2014 18:37:27 +0000 (19:37 +0100)]
Fixed bug #68671 incorrect expression in libmagic
Adam Harvey [Tue, 30 Dec 2014 18:01:51 +0000 (18:01 +0000)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Check the return value of lo_export.
Adam Harvey [Tue, 30 Dec 2014 17:59:39 +0000 (17:59 +0000)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Check the return value of lo_export.
Adam Harvey [Tue, 30 Dec 2014 17:47:19 +0000 (17:47 +0000)]
Check the return value of lo_export.
Patch by Ondřej Surý. Fixes bug #68697 (lo_export return -1 on failure).
Anatol Belski [Tue, 30 Dec 2014 15:52:54 +0000 (16:52 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
Fixed bug #66679 Alignment Bug in PCRE 8.34 upstream
remove BOM from NEWS
Anatol Belski [Tue, 30 Dec 2014 15:52:17 +0000 (16:52 +0100)]
updated NEWS
Anatol Belski [Tue, 30 Dec 2014 15:51:06 +0000 (16:51 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #66679 Alignment Bug in PCRE 8.34 upstream
remove BOM from NEWS
Anatol Belski [Tue, 30 Dec 2014 15:50:22 +0000 (16:50 +0100)]
Fixed bug #66679 Alignment Bug in PCRE 8.34 upstream
Anatol Belski [Tue, 30 Dec 2014 15:47:10 +0000 (16:47 +0100)]
remove BOM from NEWS
Dmitry Stogov [Tue, 30 Dec 2014 15:15:15 +0000 (18:15 +0300)]
Simplify array_splice()
Dmitry Stogov [Tue, 30 Dec 2014 14:04:24 +0000 (17:04 +0300)]
Simplify array_unshift()
Dmitry Stogov [Tue, 30 Dec 2014 14:03:38 +0000 (17:03 +0300)]
Simplify array_pad()
Stanislav Malyshev [Tue, 30 Dec 2014 09:27:20 +0000 (01:27 -0800)]
Merge branch 'PHP-5.6'
* PHP-5.6:
FIx bug #68618 (out of bounds read crashes php-cgi)
Fixed bug #68676 (Explicit Double Free)
Fixed bug #68676 (Explicit Double Free)
Stanislav Malyshev [Tue, 30 Dec 2014 09:26:18 +0000 (01:26 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
FIx bug #68618 (out of bounds read crashes php-cgi)
Fixed bug #68676 (Explicit Double Free)
Stanislav Malyshev [Tue, 30 Dec 2014 09:25:30 +0000 (01:25 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
FIx bug #68618 (out of bounds read crashes php-cgi)
Stanislav Malyshev [Tue, 30 Dec 2014 09:23:05 +0000 (01:23 -0800)]
FIx bug #68618 (out of bounds read crashes php-cgi)
Stanislav Malyshev [Tue, 30 Dec 2014 08:16:21 +0000 (00:16 -0800)]
Make the code lesss suspicious (can't be really 0 but it's not obvious)
Stanislav Malyshev [Mon, 29 Dec 2014 23:04:00 +0000 (15:04 -0800)]
Merge branch 'intl_size_t'
* intl_size_t:
cleanup intl types
Stanislav Malyshev [Mon, 29 Dec 2014 10:17:15 +0000 (02:17 -0800)]
cleanup intl types
Dmitry Stogov [Mon, 29 Dec 2014 21:14:13 +0000 (00:14 +0300)]
Use HashTable.u.flags instead of HashTable.arHash to check if HashTable is properly initialized
Stanislav Malyshev [Mon, 29 Dec 2014 17:50:00 +0000 (09:50 -0800)]
Revert "Add type info for spl_autoload_register"
This reverts commit
ad728725cb8e899a8415aa81db48825fac25e0d5.
Revert the change for now, probably needs better handling with account to BC
or joined with exceptions-in-engine RFC.
Andrea Faulds [Mon, 15 Dec 2014 00:51:41 +0000 (00:51 +0000)]
Make zend_parse_parameters share fast zpp implementation where possible
Rename shared implementation functions and build them unconditionally
Don't fail on empty path for zend_parse_arg_path
Update type names
Fix behaviour of by-reference "z"
Make 'o' use zend_parse_arg_object
Fix NULL string check in zend_parse_arg_path(_str)
Dmitry Stogov [Mon, 29 Dec 2014 11:21:16 +0000 (14:21 +0300)]
Micro optimization for better register allocation
Dmitry Stogov [Mon, 29 Dec 2014 11:20:52 +0000 (14:20 +0300)]
Reored conditions
Dmitry Stogov [Mon, 29 Dec 2014 10:38:36 +0000 (13:38 +0300)]
Cleanup
Kalle Sommer Nielsen [Mon, 29 Dec 2014 10:04:23 +0000 (11:04 +0100)]
Fixed bug #68676 (Explicit Double Free)
Kalle Sommer Nielsen [Mon, 29 Dec 2014 10:00:15 +0000 (11:00 +0100)]
Merge branch 'master' of https://git.php.net/push/php-src
Kalle Sommer Nielsen [Mon, 29 Dec 2014 09:57:42 +0000 (10:57 +0100)]
Fixed bug #68676 (Explicit Double Free)
Kalle Sommer Nielsen [Mon, 29 Dec 2014 09:55:14 +0000 (10:55 +0100)]
Fixed bug #68676 (Explicit Double Free)
Stanislav Malyshev [Mon, 29 Dec 2014 07:46:42 +0000 (23:46 -0800)]
eliminate usage of deprecated zend_get_parameters_ex
Stanislav Malyshev [Mon, 29 Dec 2014 07:46:28 +0000 (23:46 -0800)]
fix "comparing size_t to <0" warning
Stanislav Malyshev [Mon, 29 Dec 2014 07:18:12 +0000 (23:18 -0800)]
fix typo
Kalle Sommer Nielsen [Mon, 29 Dec 2014 06:54:44 +0000 (07:54 +0100)]
Fix tests I broke with the E_ERROR > E_RECOVERABLE_ERROR change
Xinchen Hui [Mon, 29 Dec 2014 06:35:08 +0000 (14:35 +0800)]
Use internd string as key
Xinchen Hui [Mon, 29 Dec 2014 05:46:01 +0000 (13:46 +0800)]
Fixed build of litespped
Kalle Sommer Nielsen [Sun, 28 Dec 2014 18:40:33 +0000 (19:40 +0100)]
Be verbose if --with-mp is enabled
Levi Morrison [Sun, 28 Dec 2014 17:16:14 +0000 (10:16 -0700)]
Add type info for spl_autoload_register
projects / php / log