summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2012-04-14Add function ldap_parse_virtual_list_control()dev/master/ldap-vlvJeroen van Meeuwen (Kolab Systems)1-6/+91
2012-04-13Merge branch 'PHP-5.4'David Soria Parra1-1/+1
2012-04-13Merge branch 'PHP-5.3' into PHP-5.4PHP-5.4David Soria Parra1-1/+1
2012-04-13configure.in: Check for README.GIT-RULES instead of README.SVN-RULESPHP-5.3David Soria Parra1-1/+1
2012-04-13Merge branch 'PHP-5.4'Johannes Schlüter2-150/+124
2012-04-13Merge branch 'PHP-5.3' into PHP-5.4Johannes Schlüter2-151/+124
2012-04-13Move and update README.SVN-RULES to README.GIT-RULESJohannes Schlüter2-146/+124
2012-04-12Merge branch 'PHP-5.4'Xinchen Hui1-4/+3
2012-04-12Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui1-4/+3
2012-04-12Fixed test faildXinchen Hui1-4/+3
2012-04-12Merge branch 'PHP-5.4'Johannes Schlüter0-0/+0
2012-04-12Merge branch 'PHP-5.3' into PHP-5.4Johannes Schlüter0-0/+0
2012-04-12Remove cherry-picked items for 5.3.11Johannes Schlüter1-8/+0
2012-04-12Merge branch 'PHP-5.4'Stanislav Malyshev1-0/+5
2012-04-12Copy default properties of internal classes for different threadsJohannes Schlüter1-0/+5
2012-04-11Merge branch 'PHP-5.4'Adam Harvey6-28/+52
2012-04-11Update test to fix breakage caused by the previous commit.Adam Harvey1-3/+7
2012-04-11Fix bug #61537 (json_encode() incorrectly truncates/discards information) andAdam Harvey6-25/+53
2012-04-11Fix bug #61537 (json_encode() incorrectly truncates/discards information) andAdam Harvey6-25/+49
2012-04-10Merge branch '5.4'Gustavo André dos Santos Lopes1-0/+150
2012-04-10Merge .gitattributes EOL commit from 5.3.Gustavo André dos Santos Lopes1-0/+150
2012-04-10Disabled EOL conversions on certain testsGustavo André dos Santos Lopes1-0/+149
2012-04-10Merge branch 'PHP-5.4'Anatoliy Belsky0-0/+0
2012-04-10Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky0-0/+0
2012-04-10Fixed bug #61669 ext\standard\tests\file\rename_variation7-win32.phpt failsAnatoliy Belsky1-2/+2
2012-04-10Merge branch 'PHP-5.4'Anatoliy Belsky1-0/+0
2012-04-10Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky1-0/+0
2012-04-10Fixed bug #61668 ext\standard\tests\file\rename_variation13-win32.phpt failsAnatoliy Belsky1-0/+0
2012-04-10Merge branch 'PHP-5.4'Anatoliy Belsky0-0/+0
2012-04-10Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky0-0/+0
2012-04-10Fix bug #61667 ext\standard\tests\file\glob_variation-win32.phpt failsAnatoliy Belsky1-16/+7
2012-04-10Merge branch 'PHP-5.4'Anatoliy Belsky0-0/+0
2012-04-10Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky0-0/+0
2012-04-10Fixed bug #61666 ext\standard\tests\file\file_put_contents_variation8-win32.p...Anatoliy Belsky1-3/+1
2012-04-10Merge branch 'PHP-5.4'Anatoliy Belsky0-0/+0
2012-04-10Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky0-0/+0
2012-04-10Fix bug #61659 Test ext\spl\tests\bug60082.phpt failsAnatoliy Belsky1-0/+2
2012-04-10Fixed bug #61638 Test ext\sockets\tests\unixloop.phpt failsAnatoliy Belsky1-0/+3
2012-04-10Fixed bug #61637 ext\sockets\tests\socket_sentto_recvfrom_unix.phptAnatoliy Belsky1-0/+3
2012-04-10Fixed bug #61635 ext\sockets\tests\socket_select-wrongparams-1.phptAnatoliy Belsky2-5/+29
2012-04-10Fixed bug #61638 Test ext\sockets\tests\unixloop.phpt failsAnatoliy Belsky1-0/+3
2012-04-10Fixed bug #61637 ext\sockets\tests\socket_sentto_recvfrom_unix.phptAnatoliy Belsky1-0/+3
2012-04-10Fixed bug #61635 ext\sockets\tests\socket_select-wrongparams-1.phptAnatoliy Belsky2-5/+29
2012-04-10Fixed bug #61638 Test ext\sockets\tests\unixloop.phpt failsAnatoliy Belsky1-0/+3
2012-04-10Fixed bug #61637 ext\sockets\tests\socket_sentto_recvfrom_unix.phptAnatoliy Belsky1-0/+3
2012-04-10Fixed bug #61635 ext\sockets\tests\socket_select-wrongparams-1.phptAnatoliy Belsky2-5/+29
2012-04-10Merge branch 'PHP-5.4'Anatoliy Belsky1-0/+3
2012-04-10Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky1-0/+3
2012-04-10Fixed bug #61634 Test ext\sockets\tests\socket_listen-wrongparams.phpt failsAnatoliy Belsky1-0/+3
2012-04-10Fixed bug #61633 Test ext\sockets\tests\socket_create_pair-wrongparams.phpt f...Anatoliy Belsky2-0/+41