clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 23:06:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
71,212 Commits 494 Branches 1,367 Tags 802 MiB
349baa3da4
Commit Graph

30176 Commits

Author SHA1 Message Date
Leigh
349baa3da4 Fixed license 
Looks like a find and replace gone wrong.
 2012-12-12 12:14:52 +00:00
Xinchen Hui
e200c7ade0 Merge branch 'PHP-5.4' 2012-08-02 22:29:43 +08:00
Xinchen Hui
170ee90bf9 Fixed bug that can not get default value of parameter if it's not optional 2012-08-02 22:28:04 +08:00
Xinchen Hui
c1a7369a40 Merge branch 'PHP-5.4' 2012-08-02 19:33:58 +08:00
Xinchen Hui
cbf1db38f7 Merge branch 'PHP-5.3' into PHP-5.4 2012-08-02 19:33:27 +08:00
Xinchen Hui
2b6ac9e1a0 Fix test, wrong exepct rule used 2012-08-02 19:31:34 +08:00
Xinchen Hui
6f9b638aed Merge branch 'PHP-5.4' 2012-08-02 19:24:23 +08:00
Xinchen Hui
6fb9a6922d Merge branch 'PHP-5.3' into PHP-5.4 
Conflicts:
	ext/standard/tests/file/realpath_cache.phpt
 2012-08-02 19:23:04 +08:00
Xinchen Hui
9a690859f6 fix test due to float value 2012-08-02 19:14:06 +08:00
Xinchen Hui
3ac50cfe3f Merge branch 'PHP-5.4' 2012-08-02 12:55:43 +08:00
Xinchen Hui
53c8612fe7 Fixed bug #62685 (Wrong return datatype in PDO::inTransaction()) 2012-08-02 12:55:05 +08:00
Xinchen Hui
cd896d69d9 Fixed bug #62685 (Wrong return datatype in PDO::inTransaction()) 2012-08-02 12:52:11 +08:00
Xinchen Hui
67f4043b61 Merge branch 'PHP-5.4' 2012-08-01 20:26:02 +08:00
Xinchen Hui
2026e9040f Merge branch 'PHP-5.3' into PHP-5.4 2012-08-01 20:24:14 +08:00
Xinchen Hui
10642aa9e4 Fixed bug #62715 (ReflectionParameter::isDefaultValueAvailable() wrong result) 2012-08-01 20:23:30 +08:00
Stanislav Malyshev
555d00bf63 Merge branch 'PHP-5.4' 
* PHP-5.4:
  skip tests if ibase not present
 2012-07-31 21:45:32 -07:00
Stanislav Malyshev
4d6bae896d skip tests if ibase not present 2012-07-31 21:45:04 -07:00
andrey
79c6c93e0d Fix crashes with filenames that don't contain directory separator - generated 
files like scanners/parsers.
 2012-07-30 21:50:13 +03:00
Gustavo André dos Santos Lopes
06e06f026d Merge branch '5.4' 
* 5.4:
  Fix test title and limit it to ICU >= 4.8
  Remove executable bit from files
  Limit test to ICU 49
  Remove executable bit from files
 2012-07-30 11:04:48 +02:00
Gustavo André dos Santos Lopes
86ca788cc7 Fix test title and limit it to ICU >= 4.8 2012-07-30 11:04:10 +02:00
Gustavo André dos Santos Lopes
f8e693248f Remove executable bit from files 2012-07-30 10:32:27 +02:00
Gustavo André dos Santos Lopes
dec7bad635 Merge branch '5.3' into 5.4 
* 5.3:
  Limit test to ICU 49
  Remove executable bit from files
 2012-07-30 10:31:10 +02:00
Gustavo André dos Santos Lopes
7e3e1837c8 Limit test to ICU 49 2012-07-30 10:27:41 +02:00
Gustavo André dos Santos Lopes
9762609cec Remove executable bit from files 2012-07-30 10:25:17 +02:00
Xinchen Hui
f8559194db Fix test failed due to new feature introduced in 45d596ea 2012-07-29 23:35:06 +08:00
Xinchen Hui
9c73c8d58d Merge branch 'PHP-5.4' 2012-07-29 14:31:22 +08:00
Xinchen Hui
e0c014dead Merge branch 'PHP-5.3' into PHP-5.4 2012-07-29 14:31:04 +08:00
Xinchen Hui
f419d614ba Sike test while there is no zend mm max_size guard 2012-07-29 14:30:01 +08:00
Xinchen Hui
689fda310a Merge branch 'PHP-5.4' 2012-07-29 13:26:29 +08:00
Xinchen Hui
c6ad98975e Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Skip test while zend mm is disabled
 2012-07-29 13:26:05 +08:00
Xinchen Hui
880a6cee00 Skip test while zend mm is disabled 2012-07-29 13:25:31 +08:00
Felipe Pena
6583f36a17 Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Fixed bug #57933 (Wrong table type used in phpinfo output) patch by: selsky at columbia dot edu
 2012-07-28 19:05:53 -03:00
Felipe Pena
b26749b4e9 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  - Fixed bug #57933 (Wrong table type used in phpinfo output) patch by: selsky at columbia dot edu
 2012-07-28 19:05:46 -03:00
Felipe Pena
068fc008c6 - Fixed bug #57933 (Wrong table type used in phpinfo output) patch by: selsky at columbia dot edu 2012-07-28 19:05:13 -03:00
Pierrick Charron
edece6ec84 Fixed bug #62615 (test ext/curl/tests/curl_escape.phpt failed). 
curl_easy_escape was modified in 5.21.2 to not escape "unreserved" characters
so this test will fail on version older than 5.21.2
 2012-07-26 19:13:42 -04:00
Gustavo André dos Santos Lopes
f356be68c2 ini intl.explicit_cleanup -> INTL_EXPLICIT_CLEANUP 
Added an environment variable and removed the ini setting
intl.explicit_cleanup for calling u_cleanup()
 2012-07-24 15:13:02 +02:00
Felipe Pena
777160f7b5 Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Fixed ZTS build
  Updated NES
 2012-07-24 10:02:43 -03:00
Felipe Pena
54cba5aa91 - Fixed ZTS build 2012-07-24 10:02:32 -03:00
Florian Anderiasch
81de111131 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Add syslog support to mail.log #62356
 2012-07-24 14:34:41 +02:00
Florian Anderiasch
ddc8d16245 Add syslog support to mail.log #62356 
Patch by Michael Orlitzky
 2012-07-24 14:31:30 +02:00
Florian Anderiasch
45d596ea1e Add optional depth parameter to json_encode #62369 2012-07-24 13:15:16 +02:00
Xinchen Hui
dd9d64b21e Merge branch 'PHP-5.4' 2012-07-24 14:46:25 +08:00
Xinchen Hui
9fe8c58130 binary compatibility 2012-07-24 14:45:13 +08:00
Xinchen Hui
4c1e2bbd6f Re-fix bug #55544 2012-07-24 14:43:53 +08:00
Xinchen Hui
6126ac44b5 correct the author name introduced in bb685512 2012-07-24 13:39:46 +08:00
Xinchen Hui
38fb89f91d Merge branch 'PHP-5.4' 2012-07-24 13:39:02 +08:00
Xinchen Hui
2abc4c2f6f Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 2012-07-24 13:38:11 +08:00
Xinchen Hui
c20b2ab0bd folders 2012-07-24 13:37:44 +08:00
Gustavo Lopes
ae3a827bf9 Leak caused by wrong and unreachable cleanup 2012-07-23 17:00:52 +02:00
Gustavo Lopes
01004c6abb Fixed leak in RuleBasedBreakIterator constructor 
The leak occurred in case of error.
 2012-07-23 16:51:28 +02:00