]> granicus.if.org Git - php/log
php
12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Sun, 22 Apr 2012 11:39:02 +0000 (19:39 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #61812 (Uninitialised value used in libmagic)

12 years agoFixed bug #61812 (Uninitialised value used in libmagic)
Xinchen Hui [Sun, 22 Apr 2012 11:38:14 +0000 (19:38 +0800)]
Fixed bug #61812 (Uninitialised value used in libmagic)

12 years agoMerge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
Johannes Schlüter [Sun, 22 Apr 2012 00:26:07 +0000 (02:26 +0200)]
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4

* 'PHP-5.4' of git.php.net:/php-src:
  Fix test
  typo in test
  Make css string constant
  Fixed typo
  Improved performance while sending error page
  - BFN
  - BFN
  - Fixed bug #54197 ([PATH=] sections incompatibility with user_ini.filename set to null) patch by ab@php.net
  - Fixed expected test result (patch by ab@php.net in #61769)
  - Fix test title
  add pg_escape_identifier/pg_escape_literal
  fix RCs
  Update to 5.4.2-dev
  Bug#59597 NumberFormatter::parse() with TYPE_INT64 results in a 32 bit integer

12 years agoFix folding
Johannes Schlüter [Sun, 22 Apr 2012 00:25:02 +0000 (02:25 +0200)]
Fix folding

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Sat, 21 Apr 2012 08:03:18 +0000 (16:03 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix test
  - BFN

12 years agoFix test
Xinchen Hui [Sat, 21 Apr 2012 08:02:25 +0000 (16:02 +0800)]
Fix test

Reported by cjones

12 years agotypo in test
Xinchen Hui [Sat, 21 Apr 2012 02:15:35 +0000 (10:15 +0800)]
typo in test

12 years agoMake css string constant
Xinchen Hui [Sat, 21 Apr 2012 01:31:00 +0000 (09:31 +0800)]
Make css string constant

12 years agoFixed typo
Xinchen Hui [Fri, 20 Apr 2012 16:11:06 +0000 (00:11 +0800)]
Fixed typo

report by reeze.xia@gmail.com

12 years agoImproved performance while sending error page
Xinchen Hui [Fri, 20 Apr 2012 16:01:10 +0000 (00:01 +0800)]
Improved performance while sending error page

this also fixed bug #61785 (Memory leak when access a non-exists file without router)

12 years ago- BFN
Felipe Pena [Fri, 20 Apr 2012 02:23:59 +0000 (23:23 -0300)]
- BFN

12 years ago- BFN
Felipe Pena [Fri, 20 Apr 2012 02:23:46 +0000 (23:23 -0300)]
- BFN

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Felipe Pena [Fri, 20 Apr 2012 02:13:37 +0000 (23:13 -0300)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  - Fixed bug #54197 ([PATH=] sections incompatibility with user_ini.filename set to null) patch by ab@php.net

12 years ago- Fixed bug #54197 ([PATH=] sections incompatibility with user_ini.filename set to...
Felipe Pena [Fri, 20 Apr 2012 02:12:47 +0000 (23:12 -0300)]
- Fixed bug #54197 ([PATH=] sections incompatibility with user_ini.filename set to null) patch by ab@php.net

12 years ago- Fixed expected test result (patch by ab@php.net in #61769)
Felipe Pena [Thu, 19 Apr 2012 23:15:11 +0000 (20:15 -0300)]
- Fixed expected test result (patch by ab@php.net in #61769)

12 years ago- Fix test title
Felipe Pena [Thu, 19 Apr 2012 23:05:30 +0000 (20:05 -0300)]
- Fix test title

12 years agoadd pg_escape_identifier/pg_escape_literal
Yasuo Ohgaki [Fri, 25 Nov 2011 02:21:01 +0000 (02:21 +0000)]
add pg_escape_identifier/pg_escape_literal

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Stanislav Malyshev [Thu, 19 Apr 2012 18:37:31 +0000 (11:37 -0700)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Bug#59597 NumberFormatter::parse() with TYPE_INT64 results in a 32 bit integer

12 years agoMerge branch 'pull-request/61' into PHP-5.3
Stanislav Malyshev [Thu, 19 Apr 2012 18:05:17 +0000 (11:05 -0700)]
Merge branch 'pull-request/61' into PHP-5.3

* pull-request/61:
  Bug#59597 NumberFormatter::parse() with TYPE_INT64 results in a 32 bit integer

12 years agofix RCs
Stanislav Malyshev [Thu, 19 Apr 2012 07:25:44 +0000 (00:25 -0700)]
fix RCs

12 years agoUpdate to 5.4.2-dev
Christopher Jones [Mon, 16 Apr 2012 20:43:41 +0000 (13:43 -0700)]
Update to 5.4.2-dev

After PHP-5.4.1 was branched, the PHP-5.4 branch should have been 5.4.2-dev.

12 years agoMerge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
Johannes Schlüter [Thu, 19 Apr 2012 10:48:18 +0000 (12:48 +0200)]
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4

* 'PHP-5.4' of git.php.net:/php-src:

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Thu, 19 Apr 2012 10:47:47 +0000 (12:47 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Commit generated file
  Fix bug #61755 parsing bug can lead to access violations
  Fix bug 61671 ext\spl\tests\fileobject_003.phpt fails

12 years agoCommit generated file
Johannes Schlüter [Thu, 19 Apr 2012 10:47:09 +0000 (12:47 +0200)]
Commit generated file

12 years agoFix bug #61755 parsing bug can lead to access violations
Johannes Schlüter [Thu, 19 Apr 2012 10:46:02 +0000 (12:46 +0200)]
Fix bug #61755 parsing bug can lead to access violations

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Thu, 19 Apr 2012 09:36:50 +0000 (11:36 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix bug 61671 ext\spl\tests\fileobject_003.phpt fails

12 years agoFix bug 61671 ext\spl\tests\fileobject_003.phpt fails
Anatoliy Belsky [Thu, 19 Apr 2012 09:20:16 +0000 (11:20 +0200)]
Fix bug 61671 ext\spl\tests\fileobject_003.phpt fails

The solution was already introduced in 5.4 by Etienne Kneuss and
Pierre but wasn't merged back into 5.3 . SplFileObject should
not be used with directories. So just putting together all the
necessary pieces from 5.4

12 years agoBug#59597 NumberFormatter::parse() with TYPE_INT64 results in a 32 bit integer
Sherif Ramadan [Thu, 19 Apr 2012 08:44:43 +0000 (04:44 -0400)]
Bug#59597 NumberFormatter::parse() with TYPE_INT64 results in a 32 bit integer

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Wed, 18 Apr 2012 22:30:45 +0000 (00:30 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Drop old README

12 years agoDrop old README
Johannes Schlüter [Wed, 18 Apr 2012 22:29:24 +0000 (00:29 +0200)]
Drop old README

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Wed, 18 Apr 2012 22:08:36 +0000 (00:08 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix slight grammar glitch (thanks Dan Brown)

12 years agoFix slight grammar glitch (thanks Dan Brown)
Johannes Schlüter [Wed, 18 Apr 2012 22:07:40 +0000 (00:07 +0200)]
Fix slight grammar glitch (thanks Dan Brown)

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Wed, 18 Apr 2012 20:50:21 +0000 (22:50 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Update generated file.
  Ensure the SQL parser is regenerated after changes.

12 years agoUpdate generated file.
Johannes Schlüter [Wed, 18 Apr 2012 20:47:14 +0000 (22:47 +0200)]
Update generated file.

12 years agoEnsure the SQL parser is regenerated after changes.
Johannes Schlüter [Wed, 18 Apr 2012 20:45:59 +0000 (22:45 +0200)]
Ensure the SQL parser is regenerated after changes.

12 years agoFix NEWS, the previous wrong was introduced in commit cb2a1c71c96d7c9b2ee03d77beae0c8...
Xinchen Hui [Wed, 18 Apr 2012 10:43:46 +0000 (18:43 +0800)]
Fix NEWS, the previous wrong was introduced in commit cb2a1c71c96d7c9b2ee03d77beae0c8e0d385f1b

http://git.php.net/?p=php-src.git;a=commitdiff;h=cb2a1c71c96d7c9b2ee03d77beae0c8e0d385f1b

12 years agoupdate NEWS
Xinchen Hui [Wed, 18 Apr 2012 10:42:39 +0000 (18:42 +0800)]
update NEWS

12 years agoMerge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
Johannes Schlüter [Wed, 18 Apr 2012 10:22:27 +0000 (12:22 +0200)]
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4

* 'PHP-5.4' of git.php.net:/php-src:
  Fixed bug #61761 ('Overriding' a private static method with a different signature causes crash)

12 years agoAdd NEWS
Yasuo Ohgaki [Tue, 17 Apr 2012 07:34:47 +0000 (16:34 +0900)]
Add NEWS

12 years agoImplement Request #47570 libpq's PG_VERSION should be exported to userland
Yasuo Ohgaki [Fri, 30 Mar 2012 00:45:33 +0000 (09:45 +0900)]
Implement Request #47570 libpq's PG_VERSION should be exported to userland

12 years agoFixed bug #61761 ('Overriding' a private static method with a different signature...
Xinchen Hui [Wed, 18 Apr 2012 10:13:27 +0000 (18:13 +0800)]
Fixed bug #61761 ('Overriding' a private static method with a different signature causes crash)

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Mon, 16 Apr 2012 15:07:33 +0000 (17:07 +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/*

12 years agoFix bug 61746 Failing tests in ext/standard/tests/file/windows_links/*
Anatoliy Belsky [Mon, 16 Apr 2012 15:06:30 +0000 (17:06 +0200)]
Fix bug 61746 Failing tests in ext/standard/tests/file/windows_links/*

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Mon, 16 Apr 2012 13:46:02 +0000 (15:46 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix bug 61720 ext\libxml\tests\bug61367-read.phpt fails

12 years agoFix bug 61720 ext\libxml\tests\bug61367-read.phpt fails
Anatoliy Belsky [Mon, 16 Apr 2012 13:45:03 +0000 (15:45 +0200)]
Fix bug 61720 ext\libxml\tests\bug61367-read.phpt fails

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Mon, 16 Apr 2012 13:40:10 +0000 (15:40 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix bug 61719 ext\soap\tests\bugs\bug31422.phpt fails

12 years agoFix bug 61719 ext\soap\tests\bugs\bug31422.phpt fails
Anatoliy Belsky [Mon, 16 Apr 2012 13:38:46 +0000 (15:38 +0200)]
Fix bug 61719 ext\soap\tests\bugs\bug31422.phpt fails

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Mon, 16 Apr 2012 13:26:50 +0000 (15:26 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix bug 61718 ext\ldap\tests\ldap_set_rebind_proc_error.phpt fails

12 years agoFix bug 61718 ext\ldap\tests\ldap_set_rebind_proc_error.phpt fails
Anatoliy Belsky [Mon, 16 Apr 2012 13:25:20 +0000 (15:25 +0200)]
Fix bug 61718 ext\ldap\tests\ldap_set_rebind_proc_error.phpt fails

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Mon, 16 Apr 2012 13:21:04 +0000 (15:21 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix bug 61717 ext\ldap\tests\ldap_sasl_bind_basic.phpt fails

12 years agoFix bug 61717 ext\ldap\tests\ldap_sasl_bind_basic.phpt fails
Anatoliy Belsky [Mon, 16 Apr 2012 13:20:03 +0000 (15:20 +0200)]
Fix bug 61717 ext\ldap\tests\ldap_sasl_bind_basic.phpt fails

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Mon, 16 Apr 2012 13:16:06 +0000 (15:16 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix bug 61716 tests\basic\021.phpt fails

12 years agoFix bug 61716 tests\basic\021.phpt fails
Anatoliy Belsky [Mon, 16 Apr 2012 13:14:26 +0000 (15:14 +0200)]
Fix bug 61716 tests\basic\021.phpt fails

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Mon, 16 Apr 2012 12:39:39 +0000 (14:39 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix bug 61683 tests\basic\bug20539.phpt fails

12 years agoFix bug 61683 tests\basic\bug20539.phpt fails
Anatoliy Belsky [Mon, 16 Apr 2012 12:38:16 +0000 (14:38 +0200)]
Fix bug 61683 tests\basic\bug20539.phpt fails

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Mon, 16 Apr 2012 12:05:32 +0000 (14:05 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix bug 61680 ext\zlib\tests\gzencode_variation1-win32.phpt fails

12 years agoFix bug 61680 ext\zlib\tests\gzencode_variation1-win32.phpt fails
Anatoliy Belsky [Mon, 16 Apr 2012 12:04:29 +0000 (14:04 +0200)]
Fix bug 61680 ext\zlib\tests\gzencode_variation1-win32.phpt fails

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Mon, 16 Apr 2012 11:42:52 +0000 (13:42 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix bug 61676 ext\tidy\tests\bug54682.phpt fails

Conflicts:
ext/tidy/tests/bug54682.phpt

12 years agoFix bug 61676 ext\tidy\tests\bug54682.phpt fails
Anatoliy Belsky [Mon, 16 Apr 2012 11:38:13 +0000 (13:38 +0200)]
Fix bug 61676 ext\tidy\tests\bug54682.phpt fails

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Mon, 16 Apr 2012 11:33:03 +0000 (13:33 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix bug 61743 tests in ext\standard\tests\file\windows_acls\* fail

12 years agoFix bug 61743 tests in ext\standard\tests\file\windows_acls\* fail
Anatoliy Belsky [Mon, 16 Apr 2012 11:30:58 +0000 (13:30 +0200)]
Fix bug 61743 tests in ext\standard\tests\file\windows_acls\* fail

12 years agochange the bug summary
Xinchen Hui [Mon, 16 Apr 2012 11:23:12 +0000 (19:23 +0800)]
change the bug summary

12 years agoFixed bug #61728 (php-fpm SIGSEGV running friendica on nginx)
Xinchen Hui [Sat, 14 Apr 2012 17:16:34 +0000 (01:16 +0800)]
Fixed bug #61728 (php-fpm SIGSEGV running friendica on nginx)

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Fri, 13 Apr 2012 22:31:00 +0000 (00:31 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Rename README.SVN-RULES to README.GIT-RULES, here, too

12 years agoRename README.SVN-RULES to README.GIT-RULES, here, too
Johannes Schlüter [Fri, 13 Apr 2012 22:29:55 +0000 (00:29 +0200)]
Rename README.SVN-RULES to README.GIT-RULES, here, too

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
David Soria Parra [Fri, 13 Apr 2012 14:33:25 +0000 (16:33 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  configure.in: Check for README.GIT-RULES instead of README.SVN-RULES

Conflicts:
configure.in

12 years agoconfigure.in: Check for README.GIT-RULES instead of README.SVN-RULES
David Soria Parra [Fri, 13 Apr 2012 14:32:41 +0000 (16:32 +0200)]
configure.in: Check for README.GIT-RULES instead of README.SVN-RULES

We removed the README.SVN-RULES file. Configure checks for this file.
Let's check for the new README.GIT-RULES instead.

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Fri, 13 Apr 2012 00:15:39 +0000 (02:15 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Move and update README.SVN-RULES to README.GIT-RULES

12 years agoMove and update README.SVN-RULES to README.GIT-RULES
Johannes Schlüter [Fri, 13 Apr 2012 00:12:47 +0000 (02:12 +0200)]
Move and update README.SVN-RULES to README.GIT-RULES

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Thu, 12 Apr 2012 16:11:04 +0000 (00:11 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoFixed test faild
Xinchen Hui [Thu, 12 Apr 2012 16:07:07 +0000 (00:07 +0800)]
Fixed test faild

the sun_path will not be that much long:
 http://pubs.opengroup.org/onlinepubs/009695399/basedefs/sys/un.h.html

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Thu, 12 Apr 2012 10:02:38 +0000 (12:02 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Remove cherry-picked items for 5.3.11
  Fix bug #61537 (json_encode() incorrectly truncates/discards information) and remove a test case that's now mooted by this fix.

Conflicts:
ext/json/json.c
ext/json/php_json.h

12 years agoRemove cherry-picked items for 5.3.11
Johannes Schlüter [Thu, 12 Apr 2012 09:21:41 +0000 (11:21 +0200)]
Remove cherry-picked items for 5.3.11

12 years agoCopy default properties of internal classes for different threads
Johannes Schlüter [Thu, 5 Apr 2012 16:46:52 +0000 (18:46 +0200)]
Copy default properties of internal classes for different threads

12 years agoUpdate test to fix breakage caused by the previous commit.
Adam Harvey [Mon, 2 Apr 2012 02:30:02 +0000 (10:30 +0800)]
Update test to fix breakage caused by the previous commit.

12 years agoFix bug #61537 (json_encode() incorrectly truncates/discards information) and
Adam Harvey [Mon, 2 Apr 2012 01:46:18 +0000 (09:46 +0800)]
Fix bug #61537 (json_encode() incorrectly truncates/discards information) and
remove a test case that's now mooted by this fix.

12 years agoFix bug #61537 (json_encode() incorrectly truncates/discards information) and
Adam Harvey [Mon, 2 Apr 2012 01:46:18 +0000 (09:46 +0800)]
Fix bug #61537 (json_encode() incorrectly truncates/discards information) and
remove a test case that's now mooted by this fix.

12 years agoMerge .gitattributes EOL commit from 5.3.
Gustavo André dos Santos Lopes [Tue, 10 Apr 2012 18:41:33 +0000 (19:41 +0100)]
Merge .gitattributes EOL commit from 5.3.

This merge commit includes several changes from the 5.3 commit.
This is because of 1) different tests between the two branches
and 2) the svn:eol-style attributes differing between the two
branches.

12 years agoDisabled EOL conversions on certain tests
Gustavo André dos Santos Lopes [Tue, 10 Apr 2012 18:41:07 +0000 (19:41 +0100)]
Disabled EOL conversions on certain tests

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Tue, 10 Apr 2012 13:23:38 +0000 (15:23 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #61669 ext\standard\tests\file\rename_variation7-win32.phpt fails

Conflicts:
ext/standard/tests/file/rename_variation7-win32.phpt

12 years agoFixed bug #61669 ext\standard\tests\file\rename_variation7-win32.phpt fails
Anatoliy Belsky [Tue, 10 Apr 2012 13:16:48 +0000 (15:16 +0200)]
Fixed bug #61669 ext\standard\tests\file\rename_variation7-win32.phpt fails

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Tue, 10 Apr 2012 13:12:42 +0000 (15:12 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #61668 ext\standard\tests\file\rename_variation13-win32.phpt fails

Conflicts:
ext/standard/tests/file/rename_variation13-win32.phpt

12 years agoFixed bug #61668 ext\standard\tests\file\rename_variation13-win32.phpt fails
Anatoliy Belsky [Tue, 10 Apr 2012 13:09:21 +0000 (15:09 +0200)]
Fixed bug #61668 ext\standard\tests\file\rename_variation13-win32.phpt fails

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Tue, 10 Apr 2012 13:03:41 +0000 (15:03 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix bug #61667 ext\standard\tests\file\glob_variation-win32.phpt fails

Conflicts:
ext/standard/tests/file/glob_variation-win32.phpt

12 years agoFix bug #61667 ext\standard\tests\file\glob_variation-win32.phpt fails
Anatoliy Belsky [Tue, 10 Apr 2012 13:00:03 +0000 (15:00 +0200)]
Fix bug #61667 ext\standard\tests\file\glob_variation-win32.phpt fails

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Tue, 10 Apr 2012 12:55:38 +0000 (14:55 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #61666 ext\standard\tests\file\file_put_contents_variation8-win32.phpt fails

Conflicts:
ext/standard/tests/file/file_put_contents_variation8-win32.phpt

12 years agoFixed bug #61666 ext\standard\tests\file\file_put_contents_variation8-win32.phpt...
Anatoliy Belsky [Tue, 10 Apr 2012 12:13:15 +0000 (14:13 +0200)]
Fixed bug #61666 ext\standard\tests\file\file_put_contents_variation8-win32.phpt fails

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Tue, 10 Apr 2012 12:05:07 +0000 (14:05 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix bug #61659 Test ext\spl\tests\bug60082.phpt fails
  Fixed bug #61638 Test ext\sockets\tests\unixloop.phpt fails
  Fixed bug #61637 ext\sockets\tests\socket_sentto_recvfrom_unix.phpt
  Fixed bug #61635 ext\sockets\tests\socket_select-wrongparams-1.phpt

Conflicts:
ext/spl/tests/bug60082.phpt

12 years agoFix bug #61659 Test ext\spl\tests\bug60082.phpt fails
Anatoliy Belsky [Tue, 10 Apr 2012 12:03:19 +0000 (14:03 +0200)]
Fix bug #61659 Test ext\spl\tests\bug60082.phpt fails

12 years agoFixed bug #61638 Test ext\sockets\tests\unixloop.phpt fails
Anatoliy Belsky [Tue, 10 Apr 2012 11:58:15 +0000 (13:58 +0200)]
Fixed bug #61638 Test ext\sockets\tests\unixloop.phpt fails

12 years agoFixed bug #61637 ext\sockets\tests\socket_sentto_recvfrom_unix.phpt
Anatoliy Belsky [Tue, 10 Apr 2012 11:54:22 +0000 (13:54 +0200)]
Fixed bug #61637 ext\sockets\tests\socket_sentto_recvfrom_unix.phpt

12 years agoFixed bug #61635 ext\sockets\tests\socket_select-wrongparams-1.phpt
Anatoliy Belsky [Tue, 10 Apr 2012 11:40:20 +0000 (13:40 +0200)]
Fixed bug #61635 ext\sockets\tests\socket_select-wrongparams-1.phpt

12 years agoFixed bug #61638 Test ext\sockets\tests\unixloop.phpt fails
Anatoliy Belsky [Tue, 10 Apr 2012 11:58:15 +0000 (13:58 +0200)]
Fixed bug #61638 Test ext\sockets\tests\unixloop.phpt fails

12 years agoFixed bug #61637 ext\sockets\tests\socket_sentto_recvfrom_unix.phpt
Anatoliy Belsky [Tue, 10 Apr 2012 11:54:22 +0000 (13:54 +0200)]
Fixed bug #61637 ext\sockets\tests\socket_sentto_recvfrom_unix.phpt

12 years agoFixed bug #61635 ext\sockets\tests\socket_select-wrongparams-1.phpt
Anatoliy Belsky [Tue, 10 Apr 2012 11:40:20 +0000 (13:40 +0200)]
Fixed bug #61635 ext\sockets\tests\socket_select-wrongparams-1.phpt

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Tue, 10 Apr 2012 11:09:48 +0000 (13:09 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #61634 Test ext\sockets\tests\socket_listen-wrongparams.phpt fails
  Fixed bug #61633 Test ext\sockets\tests\socket_create_pair-wrongparams.phpt fails
  Fixed bug #61632 Test ext\sockets\tests\socket_create_listen.phpt fails
  Fixed bug 61621 Test fail in ext/standard/tests/dir

12 years agoFixed bug #61634 Test ext\sockets\tests\socket_listen-wrongparams.phpt fails
Anatoliy Belsky [Tue, 10 Apr 2012 11:08:57 +0000 (13:08 +0200)]
Fixed bug #61634 Test ext\sockets\tests\socket_listen-wrongparams.phpt fails

12 years agoFixed bug #61633 Test ext\sockets\tests\socket_create_pair-wrongparams.phpt fails
Anatoliy Belsky [Tue, 10 Apr 2012 11:02:53 +0000 (13:02 +0200)]
Fixed bug #61633 Test ext\sockets\tests\socket_create_pair-wrongparams.phpt fails

12 years agoFixed bug #61632 Test ext\sockets\tests\socket_create_listen.phpt fails
Anatoliy Belsky [Tue, 10 Apr 2012 10:57:10 +0000 (12:57 +0200)]
Fixed bug #61632 Test ext\sockets\tests\socket_create_listen.phpt fails

12 years agoFixed bug #61633 Test ext\sockets\tests\socket_create_pair-wrongparams.phpt fails
Anatoliy Belsky [Tue, 10 Apr 2012 11:02:53 +0000 (13:02 +0200)]
Fixed bug #61633 Test ext\sockets\tests\socket_create_pair-wrongparams.phpt fails