granicus.if.org Git

Anatol Belski [Tue, 29 Apr 2014 11:47:09 +0000 (13:47 +0200)]

Anatol Belski [Tue, 29 Apr 2014 11:46:38 +0000 (13:46 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
updated NEWS
Fixed bug #66431 Special Character via COM Interface (CP_UTF8)

commit | commitdiff | tree

Anatol Belski [Tue, 29 Apr 2014 11:46:03 +0000 (13:46 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed bug #66431 Special Character via COM Interface (CP_UTF8)

commit | commitdiff | tree

Anatol Belski [Tue, 29 Apr 2014 11:44:54 +0000 (13:44 +0200)]

commit | commitdiff | tree

Anatol Belski [Tue, 29 Apr 2014 11:40:44 +0000 (13:40 +0200)]

Fixed bug #66431 Special Character via COM Interface (CP_UTF8)

commit | commitdiff | tree

Popa Adrian Marius [Mon, 28 Apr 2014 09:15:53 +0000 (12:15 +0300)]

Merge branch 'PHP-5.5' of https://git.php.net/push/php-src into PHP-5.5

* 'PHP-5.5' of https://git.php.net/push/php-src:
enable gmp for tests

commit | commitdiff | tree

Popa Adrian Marius [Mon, 28 Apr 2014 09:15:16 +0000 (12:15 +0300)]

Merge branch 'PHP-5.6' of https://git.php.net/push/php-src into PHP-5.6

* 'PHP-5.6' of https://git.php.net/push/php-src:
Fix crashes in GMP serialize/unserialize
enable gmp for tests

commit | commitdiff | tree

Popa Adrian Marius [Mon, 28 Apr 2014 09:14:01 +0000 (12:14 +0300)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Cleanup ZEND_MODULE_API_NO => 20050922

commit | commitdiff | tree

Popa Adrian Marius [Mon, 28 Apr 2014 09:13:44 +0000 (12:13 +0300)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Cleanup ZEND_MODULE_API_NO => 20050922

commit | commitdiff | tree

Popa Adrian Marius [Mon, 28 Apr 2014 09:13:11 +0000 (12:13 +0300)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Cleanup ZEND_MODULE_API_NO => 20050922

commit | commitdiff | tree

Popa Adrian Marius [Mon, 28 Apr 2014 09:12:52 +0000 (12:12 +0300)]

Cleanup ZEND_MODULE_API_NO => 20050922

commit | commitdiff | tree

Stanislav Malyshev [Mon, 28 Apr 2014 08:01:54 +0000 (01:01 -0700)]

Fix crashes in GMP serialize/unserialize

commit | commitdiff | tree

Stanislav Malyshev [Mon, 28 Apr 2014 07:57:47 +0000 (00:57 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
enable gmp for tests

commit | commitdiff | tree

Stanislav Malyshev [Mon, 28 Apr 2014 07:55:51 +0000 (00:55 -0700)]

enable gmp for tests

commit | commitdiff | tree

Anatol Belski [Sun, 27 Apr 2014 16:01:26 +0000 (18:01 +0200)]

Merge remote-tracking branch 'phpdbg/master' into PHP-5.6

* phpdbg/master:
C89 compat

commit | commitdiff | tree

Anatol Belski [Sun, 27 Apr 2014 15:57:38 +0000 (17:57 +0200)]

commit | commitdiff | tree

Anatol Belski [Fri, 25 Apr 2014 22:15:32 +0000 (00:15 +0200)]

Merge remote-tracking branch 'phpdbg/master' into PHP-5.6

* phpdbg/master:
  removed /EHa as __try/__catch syntax is used anyway
  fix ZEND_DEBUG usage
  fix CFLAGS_PHPDBGS and some formatting

commit | commitdiff | tree

Anatol Belski [Fri, 25 Apr 2014 22:07:13 +0000 (00:07 +0200)]

removed /EHa as __try/__catch syntax is used anyway

see http://msdn.microsoft.com/en-us/library/1deeycx5.aspx

commit | commitdiff | tree

Anatol Belski [Fri, 25 Apr 2014 20:33:28 +0000 (22:33 +0200)]

fix ZEND_DEBUG usage

commit | commitdiff | tree

Anatol Belski [Fri, 25 Apr 2014 15:40:33 +0000 (17:40 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fixed test

commit | commitdiff | tree

Anatol Belski [Fri, 25 Apr 2014 15:40:19 +0000 (17:40 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fixed test

commit | commitdiff | tree

Anatol Belski [Fri, 25 Apr 2014 15:39:53 +0000 (17:39 +0200)]

commit | commitdiff | tree

Anatol Belski [Fri, 25 Apr 2014 15:27:07 +0000 (17:27 +0200)]

commit | commitdiff | tree

Anatol Belski [Fri, 25 Apr 2014 15:26:20 +0000 (17:26 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
updated NEWS
Fixed bug #67118 DateTime constructor crash with invalid data

commit | commitdiff | tree

Anatol Belski [Fri, 25 Apr 2014 15:25:37 +0000 (17:25 +0200)]

commit | commitdiff | tree

Anatol Belski [Fri, 25 Apr 2014 15:24:58 +0000 (17:24 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed bug #67118 DateTime constructor crash with invalid data

commit | commitdiff | tree

Anatol Belski [Fri, 25 Apr 2014 15:23:26 +0000 (17:23 +0200)]

Fixed bug #67118 DateTime constructor crash with invalid data

commit | commitdiff | tree

Stanislav Malyshev [Fri, 25 Apr 2014 07:00:49 +0000 (00:00 -0700)]

commit | commitdiff | tree

Stanislav Malyshev [Fri, 25 Apr 2014 07:00:20 +0000 (00:00 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update NEWS
  add a test case previously broken by a bad fix
  Revert "Fixed bug #64604"

commit | commitdiff | tree

Stanislav Malyshev [Fri, 25 Apr 2014 07:00:01 +0000 (00:00 -0700)]

commit | commitdiff | tree

Stanislav Malyshev [Fri, 25 Apr 2014 06:59:32 +0000 (23:59 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
add a test case previously broken by a bad fix
Revert "Fixed bug #64604"

commit | commitdiff | tree

Stanislav Malyshev [Fri, 25 Apr 2014 06:58:38 +0000 (23:58 -0700)]

add a test case previously broken by a bad fix

commit | commitdiff | tree

Stanislav Malyshev [Fri, 25 Apr 2014 06:49:52 +0000 (23:49 -0700)]

Revert "Fixed bug #64604"

This reverts commit b05c088a3abf8e4c6fb6e40418423a9e2dd3d929.
Breaks parsing urls where query has : in it, like: /foo/bar?baz=goo:boo

commit | commitdiff | tree

Anatol Belski [Thu, 24 Apr 2014 18:16:06 +0000 (20:16 +0200)]

updated libmagic.patch for 5.6+

commit | commitdiff | tree

Anatol Belski [Thu, 24 Apr 2014 18:15:01 +0000 (20:15 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
updated libmagic.patch

commit | commitdiff | tree

Anatol Belski [Thu, 24 Apr 2014 18:13:47 +0000 (20:13 +0200)]

updated libmagic.patch

commit | commitdiff | tree

Anatol Belski [Thu, 24 Apr 2014 17:52:53 +0000 (19:52 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
backport this piece from 5.6, related to the #66307 fix

commit | commitdiff | tree

Anatol Belski [Thu, 24 Apr 2014 17:50:23 +0000 (19:50 +0200)]

backport this piece from 5.6, related to the #66307 fix

commit | commitdiff | tree

Anatol Belski [Thu, 24 Apr 2014 17:35:52 +0000 (19:35 +0200)]

commit | commitdiff | tree

Anatol Belski [Thu, 24 Apr 2014 17:33:54 +0000 (19:33 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed bug #66307 Fileinfo crashes with powerpoint files

Conflicts:
ext/fileinfo/libmagic/readcdf.c

commit | commitdiff | tree

Anatol Belski [Thu, 24 Apr 2014 17:30:34 +0000 (19:30 +0200)]

Fixed bug #66307 Fileinfo crashes with powerpoint files

commit | commitdiff | tree

Anatol Belski [Thu, 24 Apr 2014 11:15:16 +0000 (13:15 +0200)]

fix CFLAGS_PHPDBGS and some formatting

commit | commitdiff | tree

Anatol Belski [Thu, 24 Apr 2014 09:05:52 +0000 (11:05 +0200)]

Merge remote-tracking branch 'phpdbg/master' into PHP-5.6

commit | commitdiff | tree

Anatol Belski [Thu, 24 Apr 2014 09:01:54 +0000 (11:01 +0200)]

use a portable strndup implementation

commit | commitdiff | tree

Anatol Belski [Thu, 24 Apr 2014 09:00:36 +0000 (11:00 +0200)]

commit | commitdiff | tree

Anatol Belski [Thu, 24 Apr 2014 08:58:30 +0000 (10:58 +0200)]

commit | commitdiff | tree

Anatol Belski [Thu, 24 Apr 2014 08:52:59 +0000 (10:52 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fix dll export

commit | commitdiff | tree

Anatol Belski [Thu, 24 Apr 2014 08:52:22 +0000 (10:52 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix dll export

commit | commitdiff | tree

Anatol Belski [Thu, 24 Apr 2014 08:51:42 +0000 (10:51 +0200)]

commit | commitdiff | tree

krakjoe [Thu, 24 Apr 2014 07:09:35 +0000 (08:09 +0100)]

add parser files to dist

commit | commitdiff | tree

Stanislav Malyshev [Tue, 22 Apr 2014 23:57:47 +0000 (16:57 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fix accepting ill-formed UTF-8 characters

commit | commitdiff | tree

Stanislav Malyshev [Tue, 22 Apr 2014 23:57:17 +0000 (16:57 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix accepting ill-formed UTF-8 characters

Conflicts:
ext/phar/phar_path_check.c

commit | commitdiff | tree

Jakub Zelenka [Mon, 21 Apr 2014 12:02:20 +0000 (13:02 +0100)]

Fix accepting ill-formed UTF-8 characters

Conflicts:
ext/phar/phar_path_check.c

commit | commitdiff | tree

George Wang [Fri, 12 Oct 2012 17:04:22 +0000 (13:04 -0400)]

sapi/litespeed/lsapi_main.c: Fix bug #63228

Fix compiling error at line 606 (error: format not a string
literal and no format arguments [-Werror=format-security]

commit | commitdiff | tree

Bob Weinand [Mon, 21 Apr 2014 22:19:38 +0000 (00:19 +0200)]

Added autogenerated phpdbg parser files to .gitignore

commit | commitdiff | tree

Bob Weinand [Mon, 21 Apr 2014 21:29:25 +0000 (23:29 +0200)]

Merge sapi/phpdbg into PHP-5.6

commit | commitdiff | tree

Bob Weinand [Mon, 21 Apr 2014 21:14:06 +0000 (23:14 +0200)]

Fixed infinite loop when quitting (sometimes)

commit | commitdiff | tree

krakjoe [Mon, 21 Apr 2014 21:00:21 +0000 (22:00 +0100)]

fixup help, behaviour of step command when not executing

commit | commitdiff | tree

krakjoe [Mon, 21 Apr 2014 20:43:19 +0000 (21:43 +0100)]

buffer input to repeat commands

commit | commitdiff | tree

krakjoe [Mon, 21 Apr 2014 20:28:02 +0000 (21:28 +0100)]

Merge branch 'master' of https://github.com/krakjoe/phpdbg

commit | commitdiff | tree

krakjoe [Mon, 21 Apr 2014 20:24:41 +0000 (21:24 +0100)]

remove -e option in favour of taking script from argv[]

commit | commitdiff | tree

Stanislav Malyshev [Mon, 21 Apr 2014 00:23:15 +0000 (17:23 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Allow valid multi-byte utf-8 characters to be allowed as file names in phar archives.

commit | commitdiff | tree

Stanislav Malyshev [Mon, 21 Apr 2014 00:22:08 +0000 (17:22 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Allow valid multi-byte utf-8 characters to be allowed as file names in phar archives.

Conflicts:
ext/phar/phar_path_check.c

commit | commitdiff | tree

Danack [Thu, 13 Feb 2014 14:48:51 +0000 (14:48 +0000)]

Allow valid multi-byte utf-8 characters to be allowed as file names in phar archives.

commit | commitdiff | tree

Andrew Kehrig [Mon, 24 Feb 2014 17:01:58 +0000 (12:01 -0500)]

Fix #50444: PDO-ODBC changes for 64-bit

This bug is also referenced in
[#61777](https://bugs.php.net/bug.php?id=61777) and is still present in
the latest stable release of the 5.5 branch. I see two tickets exist for
this problem already, and I'm just submitting these changes via github
as a reminder that this is a serious problem for anyone using PDO_ODBC
on the x64 builds.

commit | commitdiff | tree

Stanislav Malyshev [Sun, 20 Apr 2014 23:36:36 +0000 (16:36 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fix a compiler warning in php_rand.h

commit | commitdiff | tree

Stanislav Malyshev [Sun, 20 Apr 2014 23:35:49 +0000 (16:35 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix a compiler warning in php_rand.h

commit | commitdiff | tree

Rouven Weßling [Mon, 24 Feb 2014 13:45:42 +0000 (14:45 +0100)]

Fix a compiler warning in php_rand.h

commit | commitdiff | tree

Stanislav Malyshev [Sun, 20 Apr 2014 23:24:15 +0000 (16:24 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fix #66908: php-fpm reload leaks epoll_create() file descriptor

commit | commitdiff | tree

Stanislav Malyshev [Sun, 20 Apr 2014 23:22:31 +0000 (16:22 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix #66908: php-fpm reload leaks epoll_create() file descriptor

commit | commitdiff | tree

Julio Pintos [Fri, 14 Mar 2014 19:47:30 +0000 (16:47 -0300)]

Fix #66908: php-fpm reload leaks epoll_create() file descriptor

This patch fixes descriptor leak which could lead to DoS once Max open files is reached

commit | commitdiff | tree

Stanislav Malyshev [Sun, 20 Apr 2014 22:26:51 +0000 (15:26 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fix bug #65701: Do not use cache for file file copy

commit | commitdiff | tree

Stanislav Malyshev [Sun, 20 Apr 2014 22:24:14 +0000 (15:24 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix bug #65701: Do not use cache for file file copy

commit | commitdiff | tree

Boro Sitnikovski [Mon, 14 Apr 2014 08:02:11 +0000 (10:02 +0200)]

Fix bug #65701: Do not use cache for file file copy

commit | commitdiff | tree

Bob Weinand [Sun, 20 Apr 2014 18:20:59 +0000 (20:20 +0200)]

commit | commitdiff | tree