]> granicus.if.org Git - php/log
php
12 years agoMerge branch 'PHP-5.4'
Xinchen Hui [Wed, 18 Apr 2012 10:15:29 +0000 (18:15 +0800)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fixed bug #61761 ('Overriding' a private static method with a different signature causes crash)

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 agopack() with new "Z" more in line with Perl.
Gustavo André dos Santos Lopes [Tue, 17 Apr 2012 21:18:48 +0000 (22:18 +0100)]
pack() with new "Z" more in line with Perl.

Made pack() with "Z" force NUL termination, even if it mean truncating input
to less than the number of characters specified and if the number of
characters is "*", the output will be one byte larger than the input.

Improved tests.

12 years agoFixed bug #61038; "Z" and better behavior for unpack()
theanomaly.is@gmail.com [Tue, 17 Apr 2012 11:31:36 +0000 (07:31 -0400)]
Fixed bug #61038; "Z" and better behavior for unpack()

Added new "Z" argument to pack/unpack, now allowing "a" to return
data without stripping, and "A" strips all trailing white space,
while "Z" will strip everything after the first null.

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 agoFix bug #61430 for trunk
Xinchen Hui [Tue, 17 Apr 2012 03:23:28 +0000 (11:23 +0800)]
Fix bug #61430 for trunk

12 years agoImplement const array/string dereference
Xinchen Hui [Sun, 15 Apr 2012 03:40:38 +0000 (11:40 +0800)]
Implement const array/string dereference

RFC:https://wiki.php.net/rfc/constdereference

12 years agoMerge branch 'PHP-5.4'
Anatoliy Belsky [Mon, 16 Apr 2012 15:07:52 +0000 (17:07 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  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 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.4'
Anatoliy Belsky [Mon, 16 Apr 2012 13:46:24 +0000 (15:46 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  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: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.4'
Anatoliy Belsky [Mon, 16 Apr 2012 13:40:38 +0000 (15:40 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  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: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 agoFix bug 61719 ext\soap\tests\bugs\bug31422.phpt fails
Anatoliy Belsky [Mon, 16 Apr 2012 13:35:47 +0000 (15:35 +0200)]
Fix bug 61719 ext\soap\tests\bugs\bug31422.phpt fails

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

* PHP-5.4:
  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: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.4'
Anatoliy Belsky [Mon, 16 Apr 2012 13:21:36 +0000 (15:21 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  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: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.4'
Anatoliy Belsky [Mon, 16 Apr 2012 13:16:43 +0000 (15:16 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  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 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.4'
Anatoliy Belsky [Mon, 16 Apr 2012 12:40:18 +0000 (14:40 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  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: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.4'
Anatoliy Belsky [Mon, 16 Apr 2012 12:06:03 +0000 (14:06 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  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 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.4'
Anatoliy Belsky [Mon, 16 Apr 2012 11:44:00 +0000 (13:44 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  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: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.4'
Anatoliy Belsky [Mon, 16 Apr 2012 11:35:15 +0000 (13:35 +0200)]
Merge branch 'PHP-5.4'

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

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 agoMerge branch 'PHP-5.4'
Xinchen Hui [Mon, 16 Apr 2012 11:23:58 +0000 (19:23 +0800)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  change the bug summary

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 agoMerge branch 'PHP-5.4'
Xinchen Hui [Sat, 14 Apr 2012 17:17:56 +0000 (01:17 +0800)]
Merge branch 'PHP-5.4'

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.4'
Johannes Schlüter [Fri, 13 Apr 2012 22:31:29 +0000 (00:31 +0200)]
Merge branch 'PHP-5.4'

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

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.4'
David Soria Parra [Fri, 13 Apr 2012 14:33:43 +0000 (16:33 +0200)]
Merge branch 'PHP-5.4'

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

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.4'
Johannes Schlüter [Fri, 13 Apr 2012 00:17:05 +0000 (02:17 +0200)]
Merge branch 'PHP-5.4'

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

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.4'
Xinchen Hui [Thu, 12 Apr 2012 16:12:40 +0000 (00:12 +0800)]
Merge branch 'PHP-5.4'

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.4'
Johannes Schlüter [Thu, 12 Apr 2012 10:03:20 +0000 (12:03 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  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.

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 agoMerge branch 'PHP-5.4'
Stanislav Malyshev [Thu, 12 Apr 2012 02:24:11 +0000 (19:24 -0700)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  Copy default properties of internal classes for different threads

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 agoMerge branch 'PHP-5.4'
Adam Harvey [Wed, 11 Apr 2012 00:33:11 +0000 (08:33 +0800)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  Update test to fix breakage caused by the previous commit.
  Fix bug #61537 (json_encode() incorrectly truncates/discards information) and remove a test case that's now mooted by this fix.

Conflicts:
NEWS

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 branch '5.4'
Gustavo André dos Santos Lopes [Tue, 10 Apr 2012 18:45:47 +0000 (19:45 +0100)]
Merge branch '5.4'

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.4'
Anatoliy Belsky [Tue, 10 Apr 2012 13:24:19 +0000 (15:24 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  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: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.4'
Anatoliy Belsky [Tue, 10 Apr 2012 13:13:12 +0000 (15:13 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  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: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.4'
Anatoliy Belsky [Tue, 10 Apr 2012 13:04:24 +0000 (15:04 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  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 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.4'
Anatoliy Belsky [Tue, 10 Apr 2012 12:56:01 +0000 (14:56 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  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: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.4'
Anatoliy Belsky [Tue, 10 Apr 2012 12:05:45 +0000 (14:05 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  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
  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

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 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.4'
Anatoliy Belsky [Tue, 10 Apr 2012 11:11:14 +0000 (13:11 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  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 #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 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

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

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 61621 Test fail in ext/standard/tests/dir
Anatoliy Belsky [Tue, 10 Apr 2012 10:47:01 +0000 (12:47 +0200)]
Fixed bug 61621 Test fail in ext/standard/tests/dir