granicus.if.org Git

commit | commitdiff | tree

Anatoliy Belsky [Fri, 11 May 2012 12:39:29 +0000 (14:39 +0200)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Fix bug #61990 ext\spl\examples\tests\dualiterator_001.phpt fails

commit | commitdiff | tree

Anatoliy Belsky [Fri, 11 May 2012 12:38:43 +0000 (14:38 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fix bug #61990 ext\spl\examples\tests\dualiterator_001.phpt fails

commit | commitdiff | tree

Xinchen Hui [Fri, 11 May 2012 12:27:07 +0000 (20:27 +0800)]

Merge branch 'PHP-5.4'

commit | commitdiff | tree

Anatoliy Belsky [Fri, 11 May 2012 12:24:12 +0000 (14:24 +0200)]

Fix bug #61990 ext\spl\examples\tests\dualiterator_001.phpt fails

This fixes a general issue. In this ticket and not for the first time
is being seen, that people are trying to use data from "examples"
in the tests. When extracting a test pack only "tests" and its siblings
was taken into account. Now "examples" are copied as well.

commit | commitdiff | tree

Xinchen Hui [Fri, 11 May 2012 12:07:27 +0000 (20:07 +0800)]

Merge branch 'remove-useless-func-decleare' of https://github.com/reeze/php-src into PHP-5.4

commit | commitdiff | tree

Reeze Xia [Fri, 11 May 2012 08:52:12 +0000 (16:52 +0800)]

Cleanup useless function declaration for traits

commit | commitdiff | tree

Anatoliy Belsky [Thu, 10 May 2012 15:35:09 +0000 (17:35 +0200)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Fix bug #61992 ext\standard\tests\general_functions\bug44295.phpt fails

commit | commitdiff | tree

Anatoliy Belsky [Thu, 10 May 2012 15:32:21 +0000 (17:32 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fix bug #61992 ext\standard\tests\general_functions\bug44295.phpt fails

commit | commitdiff | tree

Anatoliy Belsky [Thu, 10 May 2012 15:07:38 +0000 (17:07 +0200)]

Fix bug #61992 ext\standard\tests\general_functions\bug44295.phpt fails

Exception text differ on windows

commit | commitdiff | tree

Anatoliy Belsky [Thu, 10 May 2012 13:58:30 +0000 (15:58 +0200)]

Merge branch 'PHP-5.4'

* PHP-5.4:
updated NEWS

commit | commitdiff | tree

Anatoliy Belsky [Thu, 10 May 2012 13:56:50 +0000 (15:56 +0200)]

commit | commitdiff | tree

Anatoliy Belsky [Thu, 10 May 2012 13:53:08 +0000 (15:53 +0200)]

Merge branch 'PHP-5.4'

* PHP-5.4:
updated NEWS

commit | commitdiff | tree

Anatoliy Belsky [Thu, 10 May 2012 13:52:37 +0000 (15:52 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
updated NEWS

commit | commitdiff | tree

Anatoliy Belsky [Thu, 10 May 2012 13:48:56 +0000 (15:48 +0200)]

commit | commitdiff | tree

Anatoliy Belsky [Thu, 10 May 2012 13:40:17 +0000 (15:40 +0200)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Fix bug ext\standard\tests\file\realpath_cache_win32.phpt fails

commit | commitdiff | tree

Anatoliy Belsky [Thu, 10 May 2012 13:36:47 +0000 (15:36 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fix bug ext\standard\tests\file\realpath_cache_win32.phpt fails

commit | commitdiff | tree

Anatoliy Belsky [Thu, 10 May 2012 13:27:44 +0000 (15:27 +0200)]

Fix bug ext\standard\tests\file\realpath_cache_win32.phpt fails

What happens here is trivial long overflow. Despite the bug attracted
attention on windows, the same story is on linux. Just wait for a big
anough bucket->key . The linux test had %i to check the key value
which should be %d all the way.

commit | commitdiff | tree

Anatoliy Belsky [Wed, 9 May 2012 11:06:47 +0000 (13:06 +0200)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Fix bug 61901 ext\phar\tests\phar_buildfromdirectory2.phpt fails

commit | commitdiff | tree

Anatoliy Belsky [Wed, 9 May 2012 11:04:32 +0000 (13:04 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fix bug 61901 ext\phar\tests\phar_buildfromdirectory2.phpt fails

commit | commitdiff | tree

Anatoliy Belsky [Wed, 9 May 2012 11:02:33 +0000 (13:02 +0200)]

Fix bug 61901 ext\phar\tests\phar_buildfromdirectory2.phpt fails

Another error message is produced by win specific code

commit | commitdiff | tree

Xinchen Hui [Wed, 9 May 2012 03:29:19 +0000 (11:29 +0800)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Correct test title

commit | commitdiff | tree

Xinchen Hui [Wed, 9 May 2012 03:28:57 +0000 (11:28 +0800)]

commit | commitdiff | tree

Xinchen Hui [Wed, 9 May 2012 03:28:09 +0000 (11:28 +0800)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Implemented FR #61977 (Need CLI web-server support for files with .htm & svg extensions)

commit | commitdiff | tree

Xinchen Hui [Wed, 9 May 2012 03:27:39 +0000 (11:27 +0800)]

Implemented FR #61977 (Need CLI web-server support for files with .htm & svg extensions)

commit | commitdiff | tree

Xinchen Hui [Wed, 9 May 2012 03:23:37 +0000 (11:23 +0800)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Fix test failed, the fsockopen will be refused immediately if the server is not set up.
- BFN

commit | commitdiff | tree

Xinchen Hui [Wed, 9 May 2012 03:21:24 +0000 (11:21 +0800)]

Fix test failed, the fsockopen will be refused immediately if the server is not set up.

commit | commitdiff | tree

Felipe Pena [Wed, 9 May 2012 00:07:29 +0000 (21:07 -0300)]

commit | commitdiff | tree

Felipe Pena [Wed, 9 May 2012 00:06:15 +0000 (21:06 -0300)]

Merge branch 'PHP-5.4'

* PHP-5.4:
- Fixed bug #61978 (Object recursion not detected for classes that implement JsonSerializable)

commit | commitdiff | tree

Felipe Pena [Wed, 9 May 2012 00:05:51 +0000 (21:05 -0300)]

- Fixed bug #61978 (Object recursion not detected for classes that implement JsonSerializable)

commit | commitdiff | tree

David Soria Parra [Tue, 8 May 2012 20:09:13 +0000 (22:09 +0200)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Typo

commit | commitdiff | tree

David Soria Parra [Tue, 8 May 2012 20:08:54 +0000 (22:08 +0200)]

commit | commitdiff | tree

Anatoliy Belsky [Tue, 8 May 2012 17:36:15 +0000 (19:36 +0200)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Fix bug 61746 Failing tests in ext/standard/tests/file/windows_links/*

commit | commitdiff | tree

Anatoliy Belsky [Tue, 8 May 2012 17:35:13 +0000 (19:35 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fix bug 61746 Failing tests in ext/standard/tests/file/windows_links/*

commit | commitdiff | tree

Matt Ficken [Tue, 8 May 2012 17:31:41 +0000 (19:31 +0200)]

Fix bug 61746 Failing tests in ext/standard/tests/file/windows_links/*

Fixed that again for systems having their %SYSTEMROOT% not in
c:\windows

commit | commitdiff | tree

Stanislav Malyshev [Tue, 8 May 2012 17:21:10 +0000 (10:21 -0700)]

Merge branch 'PHP-5.4'

* PHP-5.4:
  c++ comments
  restore BC
  ws + restore BC to apache_request_headers
  fix bug #61807 - Buffer Overflow in apache_request_headers

commit | commitdiff | tree

Stanislav Malyshev [Tue, 8 May 2012 17:18:06 +0000 (10:18 -0700)]

commit | commitdiff | tree

Stanislav Malyshev [Tue, 8 May 2012 05:22:56 +0000 (22:22 -0700)]

commit | commitdiff | tree

Stanislav Malyshev [Tue, 8 May 2012 04:54:19 +0000 (21:54 -0700)]

ws + restore BC to apache_request_headers

commit | commitdiff | tree

Stanislav Malyshev [Mon, 7 May 2012 19:24:22 +0000 (12:24 -0700)]

fix bug #61807 - Buffer Overflow in apache_request_headers

commit | commitdiff | tree

Anatoliy Belsky [Tue, 8 May 2012 16:53:36 +0000 (18:53 +0200)]

Merge branch 'PHP-5.4'

* PHP-5.4:
updated NEWS

commit | commitdiff | tree

Anatoliy Belsky [Tue, 8 May 2012 16:52:48 +0000 (18:52 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
updated NEWS

commit | commitdiff | tree

Anatoliy Belsky [Tue, 8 May 2012 16:51:49 +0000 (18:51 +0200)]

commit | commitdiff | tree

Anatoliy Belsky [Tue, 8 May 2012 16:35:15 +0000 (18:35 +0200)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Fix bug 61713 check also that mbstring's found any internal_encoding

commit | commitdiff | tree

Anatoliy Belsky [Tue, 8 May 2012 16:34:32 +0000 (18:34 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fix bug 61713 check also that mbstring's found any internal_encoding

commit | commitdiff | tree

Anatoliy Belsky [Tue, 8 May 2012 16:31:11 +0000 (18:31 +0200)]

Fix bug 61713 check also that mbstring's found any internal_encoding

commit | commitdiff | tree

Anatoliy Belsky [Tue, 8 May 2012 16:15:19 +0000 (18:15 +0200)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Fix bug #61713 ext\standard\tests\strings\htmlentities10.phpt fails

commit | commitdiff | tree

Anatoliy Belsky [Tue, 8 May 2012 16:14:38 +0000 (18:14 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fix bug #61713 ext\standard\tests\strings\htmlentities10.phpt fails

commit | commitdiff | tree

Anatoliy Belsky [Tue, 8 May 2012 15:42:01 +0000 (17:42 +0200)]

Fix bug #61713 ext\standard\tests\strings\htmlentities10.phpt fails

There is a logic error in charset detection part for htmlentities.
When mbstring is compiled shared and mbstring.internal_encoding
is set to pass, it prevents default_charset from being checked
resulting iso-8859-1 being choosed.

commit | commitdiff | tree

Johannes Schlüter [Tue, 8 May 2012 15:30:46 +0000 (17:30 +0200)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Fix #61704 (Crash apache, phpinfo() threading issue)
Fix folding marks

commit | commitdiff | tree

Johannes Schlüter [Tue, 8 May 2012 15:30:05 +0000 (17:30 +0200)]

Fix #61704 (Crash apache, phpinfo() threading issue)

commit | commitdiff | tree

Johannes Schlüter [Tue, 8 May 2012 13:18:33 +0000 (15:18 +0200)]

commit | commitdiff | tree

Johannes Schlüter [Tue, 8 May 2012 09:50:19 +0000 (11:50 +0200)]

Merge branch 'PHP-5.4'

* PHP-5.4:
  This will be PHP 5.3.14
  improve fix for CVE-2012-1823
  improve fix for CVE-2012-1823

commit | commitdiff | tree

Johannes Schlüter [Tue, 8 May 2012 09:49:50 +0000 (11:49 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
This will be PHP 5.3.14
improve fix for CVE-2012-1823

commit | commitdiff | tree

Johannes Schlüter [Tue, 8 May 2012 09:28:15 +0000 (11:28 +0200)]

This will be PHP 5.3.14

commit | commitdiff | tree

Stanislav Malyshev [Mon, 7 May 2012 19:08:36 +0000 (12:08 -0700)]

improve fix for CVE-2012-1823

commit | commitdiff | tree

Stanislav Malyshev [Mon, 7 May 2012 19:08:36 +0000 (12:08 -0700)]

improve fix for CVE-2012-1823

commit | commitdiff | tree

Stanislav Malyshev [Mon, 7 May 2012 19:12:48 +0000 (12:12 -0700)]

Merge branch 'PHP-5.4'

* PHP-5.4:
improve fix for CVE-2012-1823
Fix for CVE-2012-1823

commit | commitdiff | tree

Stanislav Malyshev [Mon, 7 May 2012 19:10:36 +0000 (12:10 -0700)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
improve fix for CVE-2012-1823
Fix for CVE-2012-1823

commit | commitdiff | tree

Stanislav Malyshev [Mon, 7 May 2012 19:08:36 +0000 (12:08 -0700)]

improve fix for CVE-2012-1823

commit | commitdiff | tree

Rasmus Lerdorf [Thu, 3 May 2012 13:51:52 +0000 (15:51 +0200)]

Fix for CVE-2012-1823

commit | commitdiff | tree

Anatoliy Belsky [Mon, 7 May 2012 13:40:48 +0000 (15:40 +0200)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Fix bug 61905 ext\phar\tests\zip\phar_commitwrite.phpt fails
Fix bug 61903 ext\phar\tests\tar\phar_commitwrite.phpt fails

commit | commitdiff | tree

Anatoliy Belsky [Mon, 7 May 2012 13:40:16 +0000 (15:40 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fix bug 61905 ext\phar\tests\zip\phar_commitwrite.phpt fails
Fix bug 61903 ext\phar\tests\tar\phar_commitwrite.phpt fails

commit | commitdiff | tree

Anatoliy Belsky [Mon, 7 May 2012 13:39:07 +0000 (15:39 +0200)]

Fix bug 61905 ext\phar\tests\zip\phar_commitwrite.phpt fails

commit | commitdiff | tree

Anatoliy Belsky [Mon, 7 May 2012 13:37:29 +0000 (15:37 +0200)]

Fix bug 61903 ext\phar\tests\tar\phar_commitwrite.phpt fails

commit | commitdiff | tree

andrey [Mon, 7 May 2012 13:32:00 +0000 (15:32 +0200)]

these methods should return a stream. This makes it easier to intercept
the return value

commit | commitdiff | tree

andrey [Mon, 7 May 2012 11:55:40 +0000 (13:55 +0200)]

comment for the #else

commit | commitdiff | tree

andrey [Mon, 7 May 2012 11:32:05 +0000 (13:32 +0200)]

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

commit | commitdiff | tree

andrey [Mon, 7 May 2012 11:31:42 +0000 (13:31 +0200)]

reorganize things a bit...just shifting code

commit | commitdiff | tree

Anatoliy Belsky [Sun, 6 May 2012 16:06:12 +0000 (18:06 +0200)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Fix bug 61769 Random failure of php_cli_server*phpt tests

commit | commitdiff | tree

Matt Ficken [Sun, 6 May 2012 16:05:02 +0000 (18:05 +0200)]

Fix bug 61769 Random failure of php_cli_server*phpt tests

commit | commitdiff | tree

Xinchen Hui [Sun, 6 May 2012 12:37:33 +0000 (20:37 +0800)]

Merge branch 'PHP-5.4'

* PHP-5.4:
correct variable name

commit | commitdiff | tree

Xinchen Hui [Sun, 6 May 2012 12:37:03 +0000 (20:37 +0800)]

correct variable name

commit | commitdiff | tree

Xinchen Hui [Sun, 6 May 2012 12:32:33 +0000 (20:32 +0800)]

Merge branch 'PHP-5.4'

commit | commitdiff | tree

Xinchen Hui [Sun, 6 May 2012 12:32:15 +0000 (20:32 +0800)]

Merge branch 'PHP-5.3' into PHP-5.4

commit | commitdiff | tree

Xinchen Hui [Sun, 6 May 2012 12:31:40 +0000 (20:31 +0800)]

Change the test folder

commit | commitdiff | tree

Xinchen Hui [Sun, 6 May 2012 12:29:26 +0000 (20:29 +0800)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Fixed bug #61730 (Segfault from array_walk modifying an array passed by reference)

commit | commitdiff | tree

Xinchen Hui [Sun, 6 May 2012 12:06:05 +0000 (20:06 +0800)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fixed bug #61730 (Segfault from array_walk modifying an array passed by reference)

commit | commitdiff | tree

Xinchen Hui [Sun, 6 May 2012 12:01:10 +0000 (20:01 +0800)]

Fixed bug #61730 (Segfault from array_walk modifying an array passed by reference)

commit | commitdiff | tree

Nikita Popov [Sun, 6 May 2012 11:40:06 +0000 (13:40 +0200)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Add NEWS entry for bug #61961
Fixed Bug #61961 (file_get_content leaks when access empty file with max length)

commit | commitdiff | tree

Nikita Popov [Sun, 6 May 2012 11:33:47 +0000 (13:33 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Add NEWS entry for bug #61961
Fixed Bug #61961 (file_get_content leaks when access empty file with max length)

commit | commitdiff | tree

Nikita Popov [Sun, 6 May 2012 11:19:17 +0000 (13:19 +0200)]

Add NEWS entry for bug #61961

commit | commitdiff | tree

Nikita Popov [Sun, 6 May 2012 10:45:45 +0000 (12:45 +0200)]

Merge branch 'pull-request/76' into PHP-5.3

commit | commitdiff | tree

Reeze Xia [Sun, 6 May 2012 10:27:26 +0000 (18:27 +0800)]

Fixed Bug #61961 (file_get_content leaks when access empty file with max length)

commit | commitdiff | tree

Xinchen Hui [Sat, 5 May 2012 16:53:47 +0000 (00:53 +0800)]

Merge branch 'PHP-5.4'

* PHP-5.4:
  correct NEWS
  Fixed bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction)
  Fixed bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction)

commit | commitdiff | tree

Xinchen Hui [Sat, 5 May 2012 16:52:51 +0000 (00:52 +0800)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
correct NEWS
Fixed bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction)

Conflicts:
ext/curl/interface.c

commit | commitdiff | tree

Xinchen Hui [Sat, 5 May 2012 16:51:20 +0000 (00:51 +0800)]

commit | commitdiff | tree

Xinchen Hui [Sat, 5 May 2012 16:50:37 +0000 (00:50 +0800)]

Fixed bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction)

commit | commitdiff | tree

Xinchen Hui [Sat, 5 May 2012 16:40:49 +0000 (00:40 +0800)]

Fixed bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction)

commit | commitdiff | tree

David Soria Parra [Sat, 5 May 2012 15:37:35 +0000 (17:37 +0200)]

Merge branch 'PHP-5.4'

By Rasmus Lerdorf
* PHP-5.4:
Fix for CVE-2012-1823 (cherry picked from commit 29300b1f9dab068d477b241d8fd872e3a7c829b3)
Fix for CVE-2012-1823

commit | commitdiff | tree

David Soria Parra [Sat, 5 May 2012 15:36:55 +0000 (17:36 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

By Rasmus Lerdorf
* PHP-5.3:
Fix for CVE-2012-1823 (cherry picked from commit 29300b1f9dab068d477b241d8fd872e3a7c829b3)

commit | commitdiff | tree

Rasmus Lerdorf [Thu, 3 May 2012 13:51:52 +0000 (15:51 +0200)]

Fix for CVE-2012-1823
(cherry picked from commit 29300b1f9dab068d477b241d8fd872e3a7c829b3)

commit | commitdiff | tree

Rasmus Lerdorf [Thu, 3 May 2012 13:51:52 +0000 (15:51 +0200)]

Fix for CVE-2012-1823

commit | commitdiff | tree

Anatoliy Belsky [Fri, 4 May 2012 09:42:28 +0000 (11:42 +0200)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Fix bug #61906 ext\phar\tests\zip\phar_setsignaturealgo2.phpt fails

commit | commitdiff | tree

Anatoliy Belsky [Fri, 4 May 2012 09:42:05 +0000 (11:42 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fix bug #61906 ext\phar\tests\zip\phar_setsignaturealgo2.phpt fails

commit | commitdiff | tree

Anatoliy Belsky [Fri, 4 May 2012 09:40:49 +0000 (11:40 +0200)]

Fix bug #61906 ext\phar\tests\zip\phar_setsignaturealgo2.phpt fails

commit | commitdiff | tree

Anatoliy Belsky [Fri, 4 May 2012 09:38:43 +0000 (11:38 +0200)]

Merge branch 'PHP-5.4'

* PHP-5.4:
Fix bug #61904 ext\phar\tests\tar\phar_setsignaturealgo2.phpt
Bump to next version

Conflicts:
configure.in
main/php_version.h

commit | commitdiff | tree

Anatoliy Belsky [Fri, 4 May 2012 09:32:12 +0000 (11:32 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fix bug #61904 ext\phar\tests\tar\phar_setsignaturealgo2.phpt

commit | commitdiff | tree

Anatoliy Belsky [Fri, 4 May 2012 09:29:49 +0000 (11:29 +0200)]

Fix bug #61904 ext\phar\tests\tar\phar_setsignaturealgo2.phpt

commit | commitdiff | tree

Christopher Jones [Thu, 3 May 2012 19:22:39 +0000 (12:22 -0700)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Bump to next version

Conflicts:
configure.in
main/php_version.h

commit | commitdiff | tree

Christopher Jones [Thu, 3 May 2012 19:03:49 +0000 (12:03 -0700)]

Bump to next version

Bump PHP version number

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

RSS Atom