clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 07:16:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
70,146 Commits 494 Branches 1,367 Tags 803 MiB
d2718cb9ff
Commit Graph

70146 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Johannes Schlüter
d2718cb9ff Merge branch 'PHP-5.4' 
* PHP-5.4:
  Commit generated file
  Fix bug #61755 parsing bug can lead to access violations
 2012-04-19 12:49:47 +02:00
Johannes Schlüter
36a5565467 Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4 
* 'PHP-5.4' of git.php.net:/php-src:
 2012-04-19 12:48:18 +02:00
Johannes Schlüter
0589b19abf 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
 2012-04-19 12:47:47 +02:00
Johannes Schlüter
c06ec6bde4 Commit generated file 2012-04-19 12:47:09 +02:00
Johannes Schlüter
1b78aef426 Fix bug #61755 parsing bug can lead to access violations 2012-04-19 12:46:02 +02:00
Anatoliy Belsky
0e430c8ded Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug 61671 ext\spl\tests\fileobject_003.phpt fails
 2012-04-19 11:38:35 +02:00
Anatoliy Belsky
1f4b4c384e Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug 61671 ext\spl\tests\fileobject_003.phpt fails
 2012-04-19 11:36:50 +02:00
Anatoliy Belsky
adfb4c62b7 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
 2012-04-19 11:33:12 +02:00
Johannes Schlüter
904ca2f0b3 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Drop old README
 2012-04-19 00:30:58 +02:00
Johannes Schlüter
ff7e1ff677 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Drop old README
 2012-04-19 00:30:45 +02:00
Johannes Schlüter
4650b2164b Drop old README 2012-04-19 00:29:24 +02:00
Johannes Schlüter
9ca4710c9f Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix slight grammar glitch (thanks Dan Brown)
 2012-04-19 00:08:42 +02:00
Johannes Schlüter
cc85e7c313 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix slight grammar glitch (thanks Dan Brown)
 2012-04-19 00:08:36 +02:00
Johannes Schlüter
710021d1d4 Fix slight grammar glitch (thanks Dan Brown) 2012-04-19 00:07:40 +02:00
Johannes Schlüter
f3b3450f01 Merge branch 'master' of git.php.net:/php-src 
* 'master' of git.php.net:/php-src:
 2012-04-18 22:51:15 +02:00
Johannes Schlüter
15f552dbd0 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Update generated file.
  Ensure the SQL parser is regenerated after changes.
  Fix NEWS, the previous wrong was introduced in commit cb2a1c71c9
  update NEWS
 2012-04-18 22:51:06 +02:00
Johannes Schlüter
900751e8ae Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Update generated file.
  Ensure the SQL parser is regenerated after changes.
 2012-04-18 22:50:21 +02:00
Johannes Schlüter
e946eaca0b Update generated file. 2012-04-18 22:49:03 +02:00
Johannes Schlüter
dda60f3014 Ensure the SQL parser is regenerated after changes. 2012-04-18 22:48:49 +02:00
Xinchen Hui
140c8c1975 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix NEWS, the previous wrong was introduced in commit cb2a1c71c9
  update NEWS
 2012-04-18 18:48:36 +08:00
Xinchen Hui
56d8d35300 Fix NEWS, the previous wrong was introduced in commit cb2a1c71c9 
http://git.php.net/?p=php-src.git;a=commitdiff;h=cb2a1c71c96d7c9b2ee03d77beae0c8e0d385f1b
 2012-04-18 18:43:46 +08:00
Xinchen Hui
172aa3c6d7 update NEWS 2012-04-18 18:42:39 +08:00
Johannes Schlüter
fcb63a8396 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Add NEWS
  Implement Request #47570	libpq's PG_VERSION should be exported to userland
 2012-04-18 12:23:35 +02:00
Johannes Schlüter
0618e33b5d 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)
 2012-04-18 12:22:27 +02:00
Yasuo Ohgaki
d6394e66a3 Add NEWS 2012-04-18 12:21:05 +02:00
Yasuo Ohgaki
cce0f8e507 Implement Request #47570 libpq's PG_VERSION should be exported to userland 2012-04-18 12:20:35 +02:00
Xinchen Hui
6b9e88d9e6 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #61761 ('Overriding' a private static method with a different signature causes crash)
 2012-04-18 18:15:29 +08:00
Xinchen Hui
da6465a268 Fixed bug #61761 ('Overriding' a private static method with a different signature causes crash) 2012-04-18 18:13:27 +08:00
Gustavo André dos Santos Lopes
dbc5b42435 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.
 2012-04-17 22:21:32 +01:00
theanomaly.is@gmail.com
4968fa644b 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.
 2012-04-17 21:09:04 +01:00
Yasuo Ohgaki
417e9cfe1b Implement Request #47570 libpq's PG_VERSION should be exported to userland 2012-04-17 16:35:24 +09:00
Xinchen Hui
65062b47f3 Fix bug #61430 for trunk 2012-04-17 11:23:28 +08:00
Xinchen Hui
565892d4c0 Implement const array/string dereference 
RFC:https://wiki.php.net/rfc/constdereference
 2012-04-17 10:06:17 +08:00
Anatoliy Belsky
739eda38cd Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug 61746 Failing tests in ext/standard/tests/file/windows_links/*
 2012-04-16 17:07:52 +02:00
Anatoliy Belsky
d55afe4df6 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug 61746 Failing tests in ext/standard/tests/file/windows_links/*
 2012-04-16 17:07:33 +02:00
Anatoliy Belsky
f3d86b314f Fix bug 61746 Failing tests in ext/standard/tests/file/windows_links/* 2012-04-16 17:06:30 +02:00
Anatoliy Belsky
80d692f51d Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug 61720 ext\libxml\tests\bug61367-read.phpt fails
 2012-04-16 15:46:24 +02:00
Anatoliy Belsky
3d106aeb0d Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug 61720 ext\libxml\tests\bug61367-read.phpt fails
 2012-04-16 15:46:02 +02:00
Anatoliy Belsky
bceafee879 Fix bug 61720 ext\libxml\tests\bug61367-read.phpt fails 2012-04-16 15:45:03 +02:00
Anatoliy Belsky
27e1a36d19 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug 61719 ext\soap\tests\bugs\bug31422.phpt fails
 2012-04-16 15:40:38 +02:00
Anatoliy Belsky
4ac6862fc4 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug 61719 ext\soap\tests\bugs\bug31422.phpt fails
 2012-04-16 15:40:10 +02:00
Anatoliy Belsky
9c8907ec10 Fix bug 61719 ext\soap\tests\bugs\bug31422.phpt fails 2012-04-16 15:38:46 +02:00
Anatoliy Belsky
eaeeb0f5e8 Fix bug 61719 ext\soap\tests\bugs\bug31422.phpt fails 2012-04-16 15:35:47 +02:00
Anatoliy Belsky
a688e69bae Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug 61718 ext\ldap\tests\ldap_set_rebind_proc_error.phpt fails
 2012-04-16 15:27:20 +02:00
Anatoliy Belsky
5d1565088f 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
 2012-04-16 15:26:50 +02:00
Anatoliy Belsky
1c435ae498 Fix bug 61718 ext\ldap\tests\ldap_set_rebind_proc_error.phpt fails 2012-04-16 15:25:20 +02:00
Anatoliy Belsky
38d87ed3ba Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug 61717 ext\ldap\tests\ldap_sasl_bind_basic.phpt fails
 2012-04-16 15:21:36 +02:00
Anatoliy Belsky
1a44faf264 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug 61717 ext\ldap\tests\ldap_sasl_bind_basic.phpt fails
 2012-04-16 15:21:04 +02:00
Anatoliy Belsky
47e7755785 Fix bug 61717 ext\ldap\tests\ldap_sasl_bind_basic.phpt fails 2012-04-16 15:20:03 +02:00
Anatoliy Belsky
7dda0d5f8d Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug 61716 tests\basic\021.phpt fails
 2012-04-16 15:16:43 +02:00