granicus.if.org Git

Fix bug #67878 program_prefix not honoured in man pages

- add @program_prefix@ in php, phpize and php-config man pages
- set date to 2014
- fix "SEE ALSO" alignment

commit | commitdiff | tree

Anatol Belski [Thu, 21 Aug 2014 07:09:47 +0000 (09:09 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
avoid clash when stdint.h was included after win32/php_stdint.h

commit | commitdiff | tree

Anatol Belski [Thu, 21 Aug 2014 07:09:29 +0000 (09:09 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
avoid clash when stdint.h was included after win32/php_stdint.h

commit | commitdiff | tree

Anatol Belski [Thu, 21 Aug 2014 07:08:44 +0000 (09:08 +0200)]

avoid clash when stdint.h was included after win32/php_stdint.h

commit | commitdiff | tree

Dmitry Stogov [Thu, 21 Aug 2014 05:49:35 +0000 (09:49 +0400)]

Fixed get_resources() prototype comments

commit | commitdiff | tree

Stanislav Malyshev [Wed, 20 Aug 2014 21:44:40 +0000 (14:44 -0700)]

Merge branch 'PHP-5.6'

* PHP-5.6:
fix test

commit | commitdiff | tree

Stanislav Malyshev [Wed, 20 Aug 2014 21:44:33 +0000 (14:44 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fix test

commit | commitdiff | tree

Stanislav Malyshev [Wed, 20 Aug 2014 21:42:48 +0000 (14:42 -0700)]

commit | commitdiff | tree

Stanislav Malyshev [Wed, 20 Aug 2014 21:44:02 +0000 (14:44 -0700)]

Merge branch 'PHP-5.6'

* PHP-5.6:
fix test

commit | commitdiff | tree

Stanislav Malyshev [Wed, 20 Aug 2014 21:43:22 +0000 (14:43 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fix test

commit | commitdiff | tree

Stanislav Malyshev [Wed, 20 Aug 2014 21:42:48 +0000 (14:42 -0700)]

commit | commitdiff | tree

Dmitry Stogov [Wed, 20 Aug 2014 19:29:21 +0000 (23:29 +0400)]

Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
fix directory separator in test

commit | commitdiff | tree

Dmitry Stogov [Wed, 20 Aug 2014 19:28:32 +0000 (23:28 +0400)]

Fixed ext/pdo_*/tests/pdo_005.phpt tests failure

commit | commitdiff | tree

Anatol Belski [Wed, 20 Aug 2014 19:27:39 +0000 (21:27 +0200)]

fix directory separator in test

commit | commitdiff | tree

Dmitry Stogov [Wed, 20 Aug 2014 18:06:15 +0000 (22:06 +0400)]

Fixed bug #67874 (Crash in array_map())

commit | commitdiff | tree

Dmitry Stogov [Wed, 20 Aug 2014 17:42:49 +0000 (21:42 +0400)]

Fixed immutable array support

commit | commitdiff | tree

Dmitry Stogov [Wed, 20 Aug 2014 14:29:44 +0000 (18:29 +0400)]

Introduced get_resources() function.
It may be used for debugging and testing to identify resource leaks.
Changed ext/standard/tests/http/bug60570.phpt to use this function instead of unsafe attempt to catch resource leaks using get_memory_usage()

commit | commitdiff | tree

Remi Collet [Wed, 20 Aug 2014 13:17:30 +0000 (15:17 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
NEWS

commit | commitdiff | tree

Remi Collet [Wed, 20 Aug 2014 13:17:20 +0000 (15:17 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
NEWS

commit | commitdiff | tree

Remi Collet [Wed, 20 Aug 2014 13:17:05 +0000 (15:17 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
NEWS

commit | commitdiff | tree

Remi Collet [Wed, 20 Aug 2014 13:16:53 +0000 (15:16 +0200)]

commit | commitdiff | tree

Remi Collet [Wed, 20 Aug 2014 13:11:19 +0000 (15:11 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
fixed variable corruption under win x64

commit | commitdiff | tree

Remi Collet [Wed, 20 Aug 2014 13:10:54 +0000 (15:10 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fixed variable corruption under win x64

commit | commitdiff | tree

Remi Collet [Wed, 20 Aug 2014 13:10:02 +0000 (15:10 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fixed variable corruption under win x64

commit | commitdiff | tree

Anatol Belski [Sat, 11 May 2013 00:47:48 +0000 (02:47 +0200)]

fixed variable corruption under win x64

commit | commitdiff | tree

Dmitry Stogov [Wed, 20 Aug 2014 11:04:40 +0000 (15:04 +0400)]

Removed a hack that allowed passing of function return value by reference depending on value of reference-counter (Fixed Zend/tests/bug35393.phpt test failure)

commit | commitdiff | tree

Dmitry Stogov [Wed, 20 Aug 2014 11:04:03 +0000 (15:04 +0400)]

Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
phpdbg doesn't build due to the phpng merge, distable its build & test runs
phpdbg doesn't build due to the phpng merge, distable it

commit | commitdiff | tree

Lior Kaplan [Wed, 20 Aug 2014 09:13:36 +0000 (12:13 +0300)]

phpdbg doesn't build due to the phpng merge, distable its build & test runs

commit | commitdiff | tree

Lior Kaplan [Wed, 20 Aug 2014 09:13:36 +0000 (12:13 +0300)]

phpdbg doesn't build due to the phpng merge, distable it

commit | commitdiff | tree

Dmitry Stogov [Wed, 20 Aug 2014 08:03:47 +0000 (12:03 +0400)]

Reverted incorrectly changed test. Now it's the same as in PHP-5.6.

commit | commitdiff | tree

Dmitry Stogov [Wed, 20 Aug 2014 06:43:37 +0000 (10:43 +0400)]

commit | commitdiff | tree

Tjerk Meesters [Wed, 20 Aug 2014 04:13:19 +0000 (12:13 +0800)]

Fixed off-by-one memory allocation that could lead to invalid memory reads on strlen()
Always properly null terminate strings before ini parsing
Remove unnecessary memset() statements

commit | commitdiff | tree

Andrea Faulds [Tue, 19 Aug 2014 23:38:33 +0000 (00:38 +0100)]

commit | commitdiff | tree

Andrea Faulds [Tue, 19 Aug 2014 23:34:12 +0000 (00:34 +0100)]

Merge branch 'master' of git.php.net:php-src

commit | commitdiff | tree

Andrea Faulds [Tue, 19 Aug 2014 23:28:43 +0000 (00:28 +0100)]

Merge branch 'fpmConfFix' of github.com:DaveRandom/php-src

commit | commitdiff | tree

Lior Kaplan [Tue, 19 Aug 2014 22:36:56 +0000 (01:36 +0300)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  Add NEWS entry for bug #67730
  Add CVE ID for bug #67539
  Add NEWS entry for bug #67492
  Add NEWS entry for bug #67730
  Add NEWS entry for bug #67730
  Add CVE ID for bug #67539

commit | commitdiff | tree

Lior Kaplan [Tue, 19 Aug 2014 22:34:57 +0000 (01:34 +0300)]

Add NEWS entry for bug #67730

commit | commitdiff | tree

Lior Kaplan [Tue, 19 Aug 2014 22:18:15 +0000 (01:18 +0300)]

Add CVE ID for bug #67539

commit | commitdiff | tree

Lior Kaplan [Tue, 19 Aug 2014 22:16:04 +0000 (01:16 +0300)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Add NEWS entry for bug #67492
  Add NEWS entry for bug #67730
  Add NEWS entry for bug #67730
  Add CVE ID for bug #67539

commit | commitdiff | tree

Lior Kaplan [Tue, 19 Aug 2014 22:10:38 +0000 (01:10 +0300)]

Add NEWS entry for bug #67492

Included in 5.5.14 with commit d9c5a1d

commit | commitdiff | tree

Lior Kaplan [Tue, 19 Aug 2014 22:05:22 +0000 (01:05 +0300)]

Add NEWS entry for bug #67730

commit | commitdiff | tree

Lior Kaplan [Tue, 19 Aug 2014 22:01:23 +0000 (01:01 +0300)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Add NEWS entry for bug #67730
Add CVE ID for bug #67539

commit | commitdiff | tree

Lior Kaplan [Tue, 19 Aug 2014 21:54:19 +0000 (00:54 +0300)]

Add NEWS entry for bug #67730

Included in 5.4.32 with commit 706aefb

commit | commitdiff | tree

Lior Kaplan [Tue, 19 Aug 2014 21:51:37 +0000 (00:51 +0300)]

Add CVE ID for bug #67539

commit | commitdiff | tree

Sara Golemon [Tue, 19 Aug 2014 20:24:49 +0000 (13:24 -0700)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Switch use of strtok() to gd_strtok_r()

commit | commitdiff | tree

Sara Golemon [Tue, 19 Aug 2014 20:22:14 +0000 (13:22 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Switch use of strtok() to gd_strtok_r()

commit | commitdiff | tree

Sara Golemon [Tue, 19 Aug 2014 20:17:56 +0000 (13:17 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Switch use of strtok() to gd_strtok_r()

Conflicts:
NEWS

commit | commitdiff | tree

Sara Golemon [Tue, 19 Aug 2014 19:46:53 +0000 (12:46 -0700)]

Switch use of strtok() to gd_strtok_r()

strtok() is not thread safe, so this will potentially break in
very bad ways if used in ZTS mode.

I'm not sure why gd_strtok_r() exists since it seems to do the
same thing as strtok_r(), but I'll assume it's a portability
decision and do as the Romans do.

commit | commitdiff | tree

Dmitry Stogov [Tue, 19 Aug 2014 20:00:59 +0000 (00:00 +0400)]

Fixed referenced value separation

commit | commitdiff | tree

Anatol Belski [Tue, 19 Aug 2014 12:20:56 +0000 (14:20 +0200)]

fix incompatible types

commit | commitdiff | tree

Anatol Belski [Tue, 19 Aug 2014 10:51:05 +0000 (12:51 +0200)]

Merge branch 'master' of git.php.net:php-src

# By Stanislav Malyshev (5) and Remi Collet (1)
# Via Stanislav Malyshev
* 'master' of git.php.net:php-src:
  5.4.32
  fix potentially missing NUL termination
  Fix bug #67730 - Null byte injection possible with imagexxx functions
  Fixed bug #67717 - segfault in dns_get_record
  Fix bug #67716 - Segfault in cdf.c
  5.4.32 RC1

commit | commitdiff | tree

Anatol Belski [Tue, 19 Aug 2014 10:50:27 +0000 (12:50 +0200)]

fix uninitialized args usage

commit | commitdiff | tree

Stanislav Malyshev [Tue, 19 Aug 2014 08:34:38 +0000 (01:34 -0700)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  5.4.32
  fix potentially missing NUL termination
  Fix bug #67730 - Null byte injection possible with imagexxx functions
  Fixed bug #67717 - segfault in dns_get_record
  Fix bug #67716 - Segfault in cdf.c
  5.4.32 RC1

commit | commitdiff | tree

Stanislav Malyshev [Tue, 19 Aug 2014 08:34:25 +0000 (01:34 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  5.4.32
  fix potentially missing NUL termination
  Fix bug #67730 - Null byte injection possible with imagexxx functions
  Fixed bug #67717 - segfault in dns_get_record
  Fix bug #67716 - Segfault in cdf.c
  5.4.32 RC1

commit | commitdiff | tree

Stanislav Malyshev [Tue, 19 Aug 2014 08:34:09 +0000 (01:34 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  5.4.32
  fix potentially missing NUL termination
  Fix bug #67730 - Null byte injection possible with imagexxx functions
  Fixed bug #67717 - segfault in dns_get_record
  Fix bug #67716 - Segfault in cdf.c
  5.4.32 RC1

commit | commitdiff | tree

Stanislav Malyshev [Tue, 19 Aug 2014 08:33:45 +0000 (01:33 -0700)]

Merge tag 'PHP-5.4.32' into PHP-5.4

5.4.32

* tag 'PHP-5.4.32':
  5.4.32
  fix potentially missing NUL termination
  Fix bug #67730 - Null byte injection possible with imagexxx functions
  Fixed bug #67717 - segfault in dns_get_record
  Fix bug #67716 - Segfault in cdf.c
  5.4.32 RC1

Conflicts:
configure.in
main/php_version.h

commit | commitdiff | tree

Stanislav Malyshev [Tue, 19 Aug 2014 07:40:27 +0000 (00:40 -0700)]

commit | commitdiff | tree

Anatol Belski [Tue, 19 Aug 2014 07:38:13 +0000 (09:38 +0200)]

Merge branch 'master' of git.php.net:php-src

# By Remi Collet
# Via Remi Collet
* 'master' of git.php.net:php-src:
  fix merge issue in previous (again)
  fix merge issue in previous
  NEWS
  NEWS
  NEWS
  Fixed Sec Bug #67717 segfault in dns_get_record CVE-2014-3597

commit | commitdiff | tree

Anatol Belski [Tue, 19 Aug 2014 07:37:38 +0000 (09:37 +0200)]

brought back that vs2012 fix

commit | commitdiff | tree

Remi Collet [Tue, 19 Aug 2014 07:16:24 +0000 (09:16 +0200)]

fix merge issue in previous (again)

commit | commitdiff | tree

Remi Collet [Tue, 19 Aug 2014 07:10:34 +0000 (09:10 +0200)]

fix merge issue in previous

commit | commitdiff | tree

Remi Collet [Tue, 19 Aug 2014 06:56:43 +0000 (08:56 +0200)]

fix merge for #67717

commit | commitdiff | tree

Remi Collet [Tue, 19 Aug 2014 06:41:42 +0000 (08:41 +0200)]

commit | commitdiff | tree

Remi Collet [Tue, 19 Aug 2014 06:41:14 +0000 (08:41 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  NEWS
  Fixed Sec Bug #67717 segfault in dns_get_record CVE-2014-3597

commit | commitdiff | tree

Remi Collet [Tue, 19 Aug 2014 06:40:58 +0000 (08:40 +0200)]

commit | commitdiff | tree

Remi Collet [Tue, 19 Aug 2014 06:40:30 +0000 (08:40 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
NEWS
Fixed Sec Bug #67717 segfault in dns_get_record CVE-2014-3597

commit | commitdiff | tree

Remi Collet [Tue, 19 Aug 2014 06:40:18 +0000 (08:40 +0200)]

commit | commitdiff | tree

Remi Collet [Tue, 19 Aug 2014 06:33:49 +0000 (08:33 +0200)]

Fixed Sec Bug #67717 segfault in dns_get_record CVE-2014-3597

Incomplete fix for CVE-2014-4049

Check possible buffer overflow
- pass real buffer end to dn_expand calls
- check buffer len before each read

commit | commitdiff | tree

Anatol Belski [Tue, 19 Aug 2014 06:16:34 +0000 (08:16 +0200)]

commit | commitdiff | tree

Anatol Belski [Tue, 19 Aug 2014 06:05:31 +0000 (08:05 +0200)]

commit | commitdiff | tree

Stanislav Malyshev [Tue, 19 Aug 2014 06:04:24 +0000 (23:04 -0700)]

fix potentially missing NUL termination

commit | commitdiff | tree

Anatol Belski [Tue, 19 Aug 2014 06:00:52 +0000 (08:00 +0200)]

added missing define

commit | commitdiff | tree

Stanislav Malyshev [Tue, 19 Aug 2014 05:49:10 +0000 (22:49 -0700)]

Fix bug #67730 - Null byte injection possible with imagexxx functions

commit | commitdiff | tree

Anatol Belski [Tue, 19 Aug 2014 05:45:28 +0000 (07:45 +0200)]

Merge branch 'master' of git.php.net:php-src

# By Dmitry Stogov
# Via Dmitry Stogov
* 'master' of git.php.net:php-src:
Fixed encoding support

commit | commitdiff | tree

Anatol Belski [Tue, 19 Aug 2014 05:44:03 +0000 (07:44 +0200)]

fix wrong pointer indirection

commit | commitdiff | tree

Stanislav Malyshev [Tue, 19 Aug 2014 05:37:25 +0000 (22:37 -0700)]

Fixed bug #67717 - segfault in dns_get_record

commit | commitdiff | tree

Dmitry Stogov [Tue, 19 Aug 2014 05:28:13 +0000 (09:28 +0400)]

Fixed encoding support

commit | commitdiff | tree

Lior Kaplan [Mon, 18 Aug 2014 21:20:50 +0000 (00:20 +0300)]

Bump version to 7.0.0

Follow up for d9f3eac

commit | commitdiff | tree

Anatol Belski [Mon, 18 Aug 2014 20:36:57 +0000 (22:36 +0200)]

Merge branch 'master' of git.php.net:php-src

# By Derick Rethans (3) and Dmitry Stogov (1)
# Via Derick Rethans (3) and Dmitry Stogov (1)
* 'master' of git.php.net:php-src:
  Improved error message
  BFN.
  Fixed bug #67109: First uppercase letter breaks date string parsing.
  Fixed bug #66985: Some timezones are no longer valid in PHP 5.5.10.

commit | commitdiff | tree

Anatol Belski [Mon, 18 Aug 2014 20:36:38 +0000 (22:36 +0200)]

commit | commitdiff | tree

Derick Rethans [Mon, 18 Aug 2014 19:27:51 +0000 (20:27 +0100)]

Merge branch 'PHP-5.6'

commit | commitdiff | tree

Derick Rethans [Mon, 18 Aug 2014 19:27:44 +0000 (20:27 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Derick Rethans [Mon, 18 Aug 2014 19:27:33 +0000 (20:27 +0100)]

Merge branch 'datetimebugs' into PHP-5.5

commit | commitdiff | tree

Dmitry Stogov [Mon, 18 Aug 2014 17:47:30 +0000 (21:47 +0400)]

Improved error message

commit | commitdiff | tree

Derick Rethans [Mon, 18 Aug 2014 17:46:56 +0000 (18:46 +0100)]

commit | commitdiff | tree

Derick Rethans [Mon, 18 Aug 2014 17:31:26 +0000 (18:31 +0100)]

Fixed bug #67109: First uppercase letter breaks date string parsing.

commit | commitdiff | tree

Derick Rethans [Mon, 18 Aug 2014 17:22:14 +0000 (18:22 +0100)]

Fixed bug #66985: Some timezones are no longer valid in PHP 5.5.10.

commit | commitdiff | tree

Dmitry Stogov [Mon, 18 Aug 2014 17:08:50 +0000 (21:08 +0400)]

Fixed bug #67856 (Leak when using array_reduce with by-ref function)

commit | commitdiff | tree

Ferenc Kovacs [Mon, 18 Aug 2014 16:48:06 +0000 (18:48 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
improve the grammar for my recent UPGRADING note

commit | commitdiff | tree

Ferenc Kovacs [Mon, 18 Aug 2014 16:47:07 +0000 (18:47 +0200)]

improve the grammar for my recent UPGRADING note

commit | commitdiff | tree

Nikita Popov [Mon, 18 Aug 2014 16:12:50 +0000 (18:12 +0200)]

Fix bug #67858: Leak when $php_errormsg already set

commit | commitdiff | tree

Ferenc Kovacs [Mon, 18 Aug 2014 15:04:17 +0000 (17:04 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
mention the changes regarding ReflectionClass::newInstanceWithoutConstructor in UPGRADING see the discussion on the mailing list and in the pull request for details: https://github.com/php/php-src/pull/733

commit | commitdiff | tree

Ferenc Kovacs [Mon, 18 Aug 2014 14:59:03 +0000 (16:59 +0200)]

mention the changes regarding ReflectionClass::newInstanceWithoutConstructor in UPGRADING
see the discussion on the mailing list and in the pull request for details:
https://github.com/php/php-src/pull/733

commit | commitdiff | tree

Dmitry Stogov [Mon, 18 Aug 2014 06:09:25 +0000 (10:09 +0400)]

Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
Change to ext/reflection should be in its own category

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

RSS Atom