]> granicus.if.org Git - php/log
projects / php / log
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
php
10 years agoNEWS and UPGRADING for intdiv()
commit | commitdiff | tree
Andrea Faulds [Wed, 6 Aug 2014 18:56:32 +0000 (19:56 +0100)]
NEWS and UPGRADING for intdiv()

10 years agoMerge branch 'master' of git.php.net:php-src
commit | commitdiff | tree
Andrea Faulds [Wed, 6 Aug 2014 15:02:38 +0000 (16:02 +0100)]
Merge branch 'master' of git.php.net:php-src

10 years agoFixed skip case for intdiv 64-bit test
commit | commitdiff | tree
Andrea Faulds [Wed, 6 Aug 2014 15:02:02 +0000 (16:02 +0100)]
Fixed skip case for intdiv 64-bit test

10 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Andrey Hristov [Wed, 6 Aug 2014 14:04:30 +0000 (17:04 +0300)]
Merge branch 'PHP-5.6'

Conflicts:
NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Andrey Hristov [Wed, 6 Aug 2014 14:03:39 +0000 (17:03 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
NEWS
configure.in
main/php_version.h

10 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
commit | commitdiff | tree
Andrey Hristov [Wed, 6 Aug 2014 14:02:17 +0000 (17:02 +0300)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

Conflicts:
NEWS
configure.in
main/php_version.h

10 years agoMerge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
commit | commitdiff | tree
Andrey Hristov [Wed, 6 Aug 2014 13:59:56 +0000 (16:59 +0300)]
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6

Conflicts:
NEWS

10 years agoMerge branch 'master' of git.php.net:php-src
commit | commitdiff | tree
Andrey Hristov [Wed, 6 Aug 2014 13:58:30 +0000 (16:58 +0300)]
Merge branch 'master' of git.php.net:php-src

10 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Andrey Hristov [Wed, 6 Aug 2014 13:52:44 +0000 (16:52 +0300)]
Merge branch 'PHP-5.6'

10 years agoUse callback structure
commit | commitdiff | tree
Andrey Hristov [Wed, 6 Aug 2014 13:50:27 +0000 (16:50 +0300)]
Use callback structure

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Andrey Hristov [Wed, 6 Aug 2014 13:25:12 +0000 (16:25 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
ext/fileinfo/data_file.c
ext/fileinfo/libmagic/softmagic.c
ext/fileinfo/magicdata.patch

10 years agoMerge branch 'intdiv'
commit | commitdiff | tree
Andrea Faulds [Wed, 6 Aug 2014 12:59:23 +0000 (13:59 +0100)]
Merge branch 'intdiv'

* intdiv:
  Added -1 safety check, fixed test
  php_error_docref
  Fixed testcase
  Implemented intdiv()

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Andrey Hristov [Wed, 6 Aug 2014 12:28:06 +0000 (15:28 +0300)]
Merge branch 'PHP-5.4' into PHP-5.5

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Andrey Hristov [Wed, 6 Aug 2014 12:27:56 +0000 (15:27 +0300)]
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
NEWS
configure.in
main/php_version.h

10 years agoAdd EXPECTF
commit | commitdiff | tree
Andrey Hristov [Wed, 6 Aug 2014 12:27:29 +0000 (15:27 +0300)]
Add EXPECTF

10 years agoMerge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
commit | commitdiff | tree
Andrey Hristov [Wed, 6 Aug 2014 11:52:55 +0000 (14:52 +0300)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

10 years agoFix handling of multi-result sets with PS...used to clean not only
commit | commitdiff | tree
Andrey Hristov [Wed, 6 Aug 2014 11:52:12 +0000 (14:52 +0300)]
Fix handling of multi-result sets with PS...used to clean not only
the result set but the whole PS.

10 years ago5.5.17 now
commit | commitdiff | tree
Julien Pauli [Wed, 6 Aug 2014 08:20:31 +0000 (10:20 +0200)]
5.5.17 now

10 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Stanislav Malyshev [Wed, 6 Aug 2014 04:30:56 +0000 (21:30 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  5.4.33-dev now
  Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option

Conflicts:
main/streams/xp_socket.c

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Stanislav Malyshev [Wed, 6 Aug 2014 04:29:27 +0000 (21:29 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  5.4.33-dev now

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Wed, 6 Aug 2014 04:26:11 +0000 (21:26 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  5.4.33-dev now

Conflicts:
configure.in
main/php_version.h

10 years ago5.4.33-dev now
commit | commitdiff | tree
Stanislav Malyshev [Wed, 6 Aug 2014 04:24:55 +0000 (21:24 -0700)]
5.4.33-dev now

10 years agoAdd SO_REUSEPORT + SO_BROADCAST support via socket stream context option
commit | commitdiff | tree
Daniel Lowrey [Mon, 4 Aug 2014 16:41:51 +0000 (12:41 -0400)]
Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option

10 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Daniel Lowrey [Wed, 6 Aug 2014 02:58:45 +0000 (22:58 -0400)]
Merge branch 'PHP-5.6'

10 years agoAdd SO_REUSEPORT + SO_BROADCAST support via socket stream context option
commit | commitdiff | tree
Daniel Lowrey [Mon, 4 Aug 2014 16:41:51 +0000 (12:41 -0400)]
Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option

10 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Michael Wallner [Tue, 5 Aug 2014 13:48:50 +0000 (15:48 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  BFN
  BFN
  Fixed Bug #67724

10 years agoBFN
commit | commitdiff | tree
Michael Wallner [Tue, 5 Aug 2014 13:48:35 +0000 (15:48 +0200)]
BFN

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Michael Wallner [Tue, 5 Aug 2014 13:48:12 +0000 (15:48 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  BFN
  Fixed Bug #67724

10 years agoBFN
commit | commitdiff | tree
Michael Wallner [Tue, 5 Aug 2014 13:47:52 +0000 (15:47 +0200)]
BFN

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Michael Wallner [Tue, 5 Aug 2014 13:46:52 +0000 (15:46 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed Bug #67724

10 years agoFixed Bug #67724
commit | commitdiff | tree
Michael Wallner [Tue, 5 Aug 2014 13:44:43 +0000 (15:44 +0200)]
Fixed Bug #67724

(chained zlib filters silently fail with large amounts of data)

Use the same buffer size zlib uses internally to avoid
Z_DATA_ERROR on massively compressed data

10 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Remi Collet [Mon, 4 Aug 2014 09:09:25 +0000 (11:09 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  typo
  typo
  typo

10 years agotypo
commit | commitdiff | tree
Remi Collet [Mon, 4 Aug 2014 09:09:18 +0000 (11:09 +0200)]
typo

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Remi Collet [Mon, 4 Aug 2014 09:09:04 +0000 (11:09 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  typo
  typo

10 years agotypo
commit | commitdiff | tree
Remi Collet [Mon, 4 Aug 2014 09:08:54 +0000 (11:08 +0200)]
typo

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Remi Collet [Mon, 4 Aug 2014 09:08:41 +0000 (11:08 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  typo

10 years agotypo
commit | commitdiff | tree
Remi Collet [Mon, 4 Aug 2014 09:08:30 +0000 (11:08 +0200)]
typo

10 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Remi Collet [Mon, 4 Aug 2014 08:51:19 +0000 (10:51 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS
  NEWS
  NEWS
  Fixed Bug #66901 php-gd 'c_color' NULL pointer dereference

10 years agoNEWS
commit | commitdiff | tree
Remi Collet [Mon, 4 Aug 2014 08:50:56 +0000 (10:50 +0200)]
NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Remi Collet [Mon, 4 Aug 2014 08:50:33 +0000 (10:50 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  NEWS
  Fixed Bug #66901 php-gd 'c_color' NULL pointer dereference

10 years agoNEWS
commit | commitdiff | tree
Remi Collet [Mon, 4 Aug 2014 08:48:29 +0000 (10:48 +0200)]
NEWS

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Remi Collet [Mon, 4 Aug 2014 08:47:54 +0000 (10:47 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  NEWS
  Fixed Bug #66901 php-gd 'c_color' NULL pointer dereference

10 years agoNEWS
commit | commitdiff | tree
Remi Collet [Mon, 4 Aug 2014 08:46:53 +0000 (10:46 +0200)]
NEWS

10 years agoFixed Bug #66901 php-gd 'c_color' NULL pointer dereference
commit | commitdiff | tree
Remi Collet [Mon, 4 Aug 2014 08:42:39 +0000 (10:42 +0200)]
Fixed Bug #66901 php-gd 'c_color' NULL pointer dereference

Upstream https://bitbucket.org/libgd/gd-libgd/commits/463c3bd09bfe8e924e19acad7a2a6af16953a704

Notice: this fix don't manage monochrome/monovisual values
but just fix the security issue CVE-2014-2497
failing when trying to load such an image

10 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Anatol Belski [Mon, 4 Aug 2014 07:59:06 +0000 (09:59 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  backport the fix for bug #67739

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Anatol Belski [Mon, 4 Aug 2014 07:58:47 +0000 (09:58 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  backport the fix for bug #67739

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Anatol Belski [Mon, 4 Aug 2014 07:57:59 +0000 (09:57 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  backport the fix for bug #67739

10 years agobackport the fix for bug #67739
commit | commitdiff | tree
Anatol Belski [Mon, 4 Aug 2014 07:57:08 +0000 (09:57 +0200)]
backport the fix for bug #67739

10 years agoMerge branch 'pull-request/756'
commit | commitdiff | tree
Anatol Belski [Mon, 4 Aug 2014 07:47:11 +0000 (09:47 +0200)]
Merge branch 'pull-request/756'

10 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Stanislav Malyshev [Mon, 4 Aug 2014 07:15:38 +0000 (00:15 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix bug #67705 (extensive backtracking in rule regular expression)
  add test
  Fix bug #67705 (extensive backtracking in rule regular expression)

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Stanislav Malyshev [Mon, 4 Aug 2014 07:12:43 +0000 (00:12 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  add test
  Fix bug #67705 (extensive backtracking in rule regular expression)

Conflicts:
ext/fileinfo/data_file.c
ext/fileinfo/libmagic/softmagic.c
ext/fileinfo/magicdata.patch

10 years agoFix bug #67705 (extensive backtracking in rule regular expression)
commit | commitdiff | tree
Stanislav Malyshev [Mon, 4 Aug 2014 07:08:35 +0000 (00:08 -0700)]
Fix bug #67705 (extensive backtracking in rule regular expression)

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Mon, 4 Aug 2014 07:08:17 +0000 (00:08 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  add test

10 years agoadd test
commit | commitdiff | tree
Stanislav Malyshev [Mon, 4 Aug 2014 07:08:08 +0000 (00:08 -0700)]
add test

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Mon, 4 Aug 2014 07:05:56 +0000 (00:05 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #67705 (extensive backtracking in rule regular expression)

10 years agoFix bug #67705 (extensive backtracking in rule regular expression)
commit | commitdiff | tree
Stanislav Malyshev [Mon, 4 Aug 2014 07:01:57 +0000 (00:01 -0700)]
Fix bug #67705 (extensive backtracking in rule regular expression)

10 years agoPatches #67739
commit | commitdiff | tree
Christian Wenz [Fri, 1 Aug 2014 20:38:18 +0000 (22:38 +0200)]
Patches #67739

Fixes #67739: Windows 8.1/Server 2012 R2 OS build number reported as 6.2 (instead of 6.3)

10 years agoPHP_INT_MIN and _MAX tests
commit | commitdiff | tree
Andrea Faulds [Fri, 1 Aug 2014 16:01:17 +0000 (17:01 +0100)]
PHP_INT_MIN and _MAX tests

10 years agoMerge branch 'PHP_INT_MIN'
commit | commitdiff | tree
Andrea Faulds [Fri, 1 Aug 2014 15:29:34 +0000 (16:29 +0100)]
Merge branch 'PHP_INT_MIN'

10 years agoNEWS and UPGRADING
commit | commitdiff | tree
Andrea Faulds [Fri, 1 Aug 2014 15:28:20 +0000 (16:28 +0100)]
NEWS and UPGRADING

10 years agoAdded PHP_INT_MIN
commit | commitdiff | tree
Andrea Faulds [Fri, 1 Aug 2014 13:29:50 +0000 (14:29 +0100)]
Added PHP_INT_MIN

10 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Andrey Hristov [Thu, 31 Jul 2014 18:28:19 +0000 (21:28 +0300)]
Merge branch 'PHP-5.6'

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Andrey Hristov [Thu, 31 Jul 2014 18:28:09 +0000 (21:28 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6

10 years agoFix wrong lenght size
commit | commitdiff | tree
Andrey Hristov [Thu, 31 Jul 2014 18:27:51 +0000 (21:27 +0300)]
Fix wrong lenght size

10 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Peter Cowburn [Thu, 31 Jul 2014 13:35:13 +0000 (14:35 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Bug #51096 - Remove unnecessary ? for first/last day of

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Peter Cowburn [Thu, 31 Jul 2014 13:34:50 +0000 (14:34 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Bug #51096 - Remove unnecessary ? for first/last day of

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Peter Cowburn [Thu, 31 Jul 2014 13:33:55 +0000 (14:33 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Bug #51096 - Remove unnecessary ? for first/last day of

Conflicts:
ext/date/lib/parse_date.c

10 years agoMerge branch 'pull-request/754' into PHP-5.4
commit | commitdiff | tree
Peter Cowburn [Thu, 31 Jul 2014 13:30:39 +0000 (14:30 +0100)]
Merge branch 'pull-request/754' into PHP-5.4

10 years agoBug #51096 - Remove unnecessary ? for first/last day of
commit | commitdiff | tree
Peter Cowburn [Thu, 31 Jul 2014 13:21:38 +0000 (14:21 +0100)]
Bug #51096 - Remove unnecessary ? for first/last day of

10 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Tjerk Meesters [Thu, 31 Jul 2014 04:18:19 +0000 (12:18 +0800)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Moved streams related functions to xp_ssl.c

10 years agoMoved streams related functions to xp_ssl.c
commit | commitdiff | tree
Tjerk Meesters [Thu, 31 Jul 2014 04:17:17 +0000 (12:17 +0800)]
Moved streams related functions to xp_ssl.c

10 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Keyur Govande [Wed, 30 Jul 2014 18:50:07 +0000 (18:50 +0000)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Remove duplicate NEWS
  Update NEWS
  Update NEWS
  Update NEWS

10 years agoRemove duplicate NEWS
commit | commitdiff | tree
Keyur Govande [Wed, 30 Jul 2014 18:48:43 +0000 (18:48 +0000)]
Remove duplicate NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Keyur Govande [Wed, 30 Jul 2014 18:41:13 +0000 (18:41 +0000)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Update NEWS
  Update NEWS

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Keyur Govande [Wed, 30 Jul 2014 18:39:59 +0000 (18:39 +0000)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Update NEWS

10 years agoUpdate NEWS
commit | commitdiff | tree
Keyur Govande [Wed, 30 Jul 2014 18:36:09 +0000 (18:36 +0000)]
Update NEWS

10 years agoUpdate NEWS
commit | commitdiff | tree
Keyur Govande [Wed, 30 Jul 2014 18:37:25 +0000 (18:37 +0000)]
Update NEWS

10 years agoUpdate NEWS
commit | commitdiff | tree
Keyur Govande [Wed, 30 Jul 2014 18:33:19 +0000 (18:33 +0000)]
Update NEWS

10 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Michael Wallner [Wed, 30 Jul 2014 18:14:40 +0000 (20:14 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  BFN
  BFN
  Fixed bug #67715 (php-milter does not build and crashes randomly).

10 years agoBFN
commit | commitdiff | tree
Michael Wallner [Wed, 30 Jul 2014 18:14:03 +0000 (20:14 +0200)]
BFN

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Michael Wallner [Wed, 30 Jul 2014 18:13:39 +0000 (20:13 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  BFN
  Fixed bug #67715 (php-milter does not build and crashes randomly).

10 years agoBFN
commit | commitdiff | tree
Michael Wallner [Wed, 30 Jul 2014 18:13:17 +0000 (20:13 +0200)]
BFN

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Michael Wallner [Wed, 30 Jul 2014 18:12:50 +0000 (20:12 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #67715 (php-milter does not build and crashes randomly).

10 years agoFixed bug #67715 (php-milter does not build and crashes randomly).
commit | commitdiff | tree
Michael Wallner [Wed, 30 Jul 2014 18:12:13 +0000 (20:12 +0200)]
Fixed bug #67715 (php-milter does not build and crashes randomly).

10 years agoMerge commit '8b9719d'
commit | commitdiff | tree
Rasmus Lerdorf [Wed, 30 Jul 2014 16:23:46 +0000 (12:23 -0400)]
Merge commit '8b9719d'

* commit '8b9719d':
  We need to turn off any strict mode here for this warning to show up

10 years agoMerge commit '8b9719d' into PHP-5.6
commit | commitdiff | tree
Rasmus Lerdorf [Wed, 30 Jul 2014 16:23:36 +0000 (12:23 -0400)]
Merge commit '8b9719d' into PHP-5.6

* commit '8b9719d':
  We need to turn off any strict mode here for this warning to show up

10 years agoMerge commit '8b9719d' into PHP-5.5
commit | commitdiff | tree
Rasmus Lerdorf [Wed, 30 Jul 2014 16:23:24 +0000 (12:23 -0400)]
Merge commit '8b9719d' into PHP-5.5

* commit '8b9719d':
  We need to turn off any strict mode here for this warning to show up

10 years agoWe need to turn off any strict mode here for this warning to show up
commit | commitdiff | tree
Rasmus Lerdorf [Wed, 30 Jul 2014 16:22:48 +0000 (12:22 -0400)]
We need to turn off any strict mode here for this warning to show up

10 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Bob Weinand [Wed, 30 Jul 2014 16:07:01 +0000 (18:07 +0200)]
Merge branch 'PHP-5.6'

10 years agoDisable restrictions regarding arrays in constants at run-time.
commit | commitdiff | tree
Bob Weinand [Wed, 30 Jul 2014 15:57:07 +0000 (17:57 +0200)]
Disable restrictions regarding arrays in constants at run-time.
For the discussion around it, see the thread on the mailing list:
http://www.mail-archive.com/internals@lists.php.net/msg68245.html

10 years agoRevert "Fix bug #67064 in a BC safe way"
commit | commitdiff | tree
Bob Weinand [Wed, 30 Jul 2014 15:18:05 +0000 (17:18 +0200)]
Revert "Fix bug #67064 in a BC safe way"

This reverts commit 1a4a9eede59b853f11e8e8b965e5f715f53da8f7.

Conflicts:
ext/standard/array.c
ext/standard/tests/array/bug67064.phpt

10 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Tjerk Meesters [Wed, 30 Jul 2014 10:28:23 +0000 (18:28 +0800)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Updated NEWS for #67693
  Fixed bug #67693 - incorrect push to the empty array

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Tjerk Meesters [Wed, 30 Jul 2014 10:27:29 +0000 (18:27 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Updated NEWS for #67693
  Fixed bug #67693 - incorrect push to the empty array

10 years agoUpdated NEWS for #67693
commit | commitdiff | tree
Tjerk Meesters [Wed, 30 Jul 2014 10:17:36 +0000 (18:17 +0800)]
Updated NEWS for #67693

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Tjerk Meesters [Wed, 30 Jul 2014 10:17:13 +0000 (18:17 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Updated NEWS for #67693
  Fixed bug #67693 - incorrect push to the empty array

10 years agoUpdated NEWS for #67693
commit | commitdiff | tree
Tjerk Meesters [Wed, 30 Jul 2014 10:16:56 +0000 (18:16 +0800)]
Updated NEWS for #67693

10 years agoFixed bug #67693 - incorrect push to the empty array
commit | commitdiff | tree
Tjerk Meesters [Wed, 30 Jul 2014 09:54:09 +0000 (17:54 +0800)]
Fixed bug #67693 - incorrect push to the empty array

10 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Ferenc Kovacs [Wed, 30 Jul 2014 09:47:29 +0000 (11:47 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  add missing entry to NEWS

10 years agoadd missing entry to NEWS
commit | commitdiff | tree
Ferenc Kovacs [Wed, 30 Jul 2014 09:47:14 +0000 (11:47 +0200)]
add missing entry to NEWS

10 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Ferenc Kovacs [Wed, 30 Jul 2014 09:27:13 +0000 (11:27 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  add missing entries to NEWS

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