clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 15:26:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
70,300 Commits 494 Branches 1,367 Tags 807 MiB
20dd5ccf19
Commit Graph

70300 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gustavo André dos Santos Lopes
20dd5ccf19 Cache arguments type info in MessageFormatter. 2012-05-13 20:53:05 +01:00
Gustavo André dos Santos Lopes
407455876e Set global error if insufficient numeric args. WS. 2012-05-13 20:53:05 +01:00
Gustavo André dos Santos Lopes
f1621485ad Fixed MessageFormatter subformat tests. 2012-05-13 20:53:05 +01:00
Gustavo André dos Santos Lopes
edca0e2adb Refactoring of patch for FR #61871. 2012-05-13 20:52:41 +01:00
Gustavo André dos Santos Lopes
c9b913b56b Orig patch for FR #61871 by David Sklar 2012-05-13 20:51:43 +01:00
Xinchen Hui
6b16f7cd69 Merge branch 'PHP-5.4' 2012-05-03 22:40:51 +08:00
Xinchen Hui
72f19e9a8b Fixed bug #61922 (ZTS build doesn't accept zend.script_encoding config) 2012-05-03 22:39:53 +08:00
andrey
f1f1c5c900 Merge branch 'master' of git.php.net:php-src 2012-05-03 15:34:24 +02:00
andrey
267f691a45 bump mysqlnd versions 2012-05-03 15:33:47 +02:00
Xinchen Hui
e022bfe34a Merge remote-tracking branch 'origin/PHP-5.4' 
* origin/PHP-5.4:
  Fixed test bug #61892
 2012-05-03 20:00:10 +08:00
Xinchen Hui
d74d88fbb9 Fixed test bug #61892 2012-05-03 19:56:49 +08:00
andrey
b850fa14e0 phoenix from the ashes 2012-05-03 13:34:26 +02:00
andrey
0ce37188cd here comes the news 2012-05-03 13:02:34 +02:00
andrey
e0c7ed91a4 Merge branch 'master' of git.php.net:php-src 2012-05-03 13:00:17 +02:00
andrey
522595086b Remove support for local infile handler in mysqli from 5.5 
This removes the following functions from the API:
mysqli_set_local_infile_default()
mysqli_set_local_infile_handler()

Using these functions is known to be lead to stability problems in
mysqli. It was only enabled when compiling against libmysql. mysqlnd
doesn't have this support for local infile. However, with mysqlnd it can
be emulated by using stream handlers like in:

$c->query("LOAD DATA LOCAL INFILE "http://example.com/import.csv" INTO ...")
All available protocols, as well as user implemented ones can be added.
 2012-05-03 12:55:03 +02:00
Xinchen Hui
604d11ee6c Merge remote-tracking branch 'origin/PHP-5.4' 2012-05-03 18:41:45 +08:00
Xinchen Hui
75d23f5714 Merge remote-tracking branch 'origin/PHP-5.3' into PHP-5.4 
* origin/PHP-5.3:
  Fix typo
 2012-05-03 18:40:57 +08:00
Xinchen Hui
bbf8a50281 Fix typo 
picked form pull request of reeze.xia@gmail.com
 2012-05-03 18:39:03 +08:00
andrey
57f7bd0d85 remove dead and unused for more than 8 years code 2012-05-03 12:22:25 +02:00
Anatoliy Belsky
62de1cfe33 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug 61902 ext\phar\tests\phar_setsignaturealgo2.phpt falis
 2012-05-02 21:42:57 +02:00
Anatoliy Belsky
cdce62b724 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug 61902 ext\phar\tests\phar_setsignaturealgo2.phpt falis
 2012-05-02 21:41:33 +02:00
Anatoliy Belsky
69ed09a31c Fix bug 61902 ext\phar\tests\phar_setsignaturealgo2.phpt falis 
openssl needs explicit openssl.cnf on windows
 2012-05-02 21:38:32 +02:00
andrey
cd9e4d1def Merge branch 'PHP-5.4' 2012-05-02 16:15:35 +02:00
andrey
67419499b2 Merge branch 'PHP-5.3' into PHP-5.4 2012-05-02 15:57:08 +02:00
andrey
b42d000471 Fix for bug#61411 
Bug #61411 PDO Segfaults with PERSISTENT == TRUE && EMULATE_PREPARES == FALSE
Wrong allocation, that doesn't follow the scheme of using stmt->persistent
was the root cause of the problem and the crash at free.
 2012-05-02 15:55:22 +02:00
Stanislav Malyshev
8c41e45eec Merge branch 'PHP-5.4' 
* PHP-5.4:
  merge 5.3.11 stuff
  organize NEWS
  Revert "Fix bug #61537 (json_encode() incorrectly truncates/discards information) and"
 2012-05-02 00:11:19 -07:00
Stanislav Malyshev
e25eea8b83 merge 5.3.11 stuff 2012-05-02 00:08:04 -07:00
Stanislav Malyshev
b0e8be8aea organize NEWS 2012-05-02 00:00:59 -07:00
Stanislav Malyshev
7bbd5521d2 Revert "Fix bug #61537 (json_encode() incorrectly truncates/discards information) and" 
This reverts commit cb2a1c71c9.
The fix is not correct, not fixed after discussion on github.
Please fix the issues and reapply the patch
 2012-05-01 23:54:10 -07:00
Christopher Jones
a499dfc37d Merge branch 'PHP-5.4' 
* PHP-5.4:
  Make output order for dom007.phpt platform independent
 2012-05-01 15:51:01 -07:00
Christopher Jones
93192ec56d Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Make output order for dom007.phpt platform independent
 2012-05-01 15:49:19 -07:00
Christopher Jones
72507d38fb Merge branch 'bug61810' into PHP-5.3 
* bug61810:
  Make output order for dom007.phpt platform independent
 2012-05-01 15:47:54 -07:00
Christopher Jones
d14f23365c Make output order for dom007.phpt platform independent 
This test has long been near the top of the reported output diffs.
For example, on http://qa.php.net/reports/?version=5.4.0 it has diffed
1307 times out of 3543 reports, at time of this commit.  (The second
highest diff has occurred 710 times.)
 2012-05-01 15:43:31 -07:00
Christopher Jones
f2e81779a7 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix masking in bug61115-1.phpt

Conflicts:
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner_defs.h
 2012-05-01 14:47:18 -07:00
Christopher Jones
cac09f3333 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix masking in bug61115-1.phpt
 2012-05-01 14:34:54 -07:00
Christopher Jones
02e25df8b5 Merge branch 'fix-bug61115-1.phpt-for-no-debug' into PHP-5.3 
* fix-bug61115-1.phpt-for-no-debug:
  Fix masking in bug61115-1.phpt
 2012-05-01 14:33:57 -07:00
Christopher Jones
c864b1ca2f Fix masking in bug61115-1.phpt 
The test bug61115-1.phpt was diffing for non-debug builds
 2012-05-01 14:32:09 -07:00
Felipe Pena
1c2c620a58 - Regenerated files 2012-04-30 15:57:09 -03:00
Felipe Pena
4deb0f1a0a - Regenerated files 2012-04-30 15:57:00 -03:00
Felipe Pena
45ef3c759e Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Fixed Windows build
 2012-04-30 15:56:15 -03:00
Felipe Pena
79961dccab - Fixed Windows build 2012-04-30 15:55:57 -03:00
Anatoliy Belsky
3e7af0f25a Merge branch 'master' of git.php.net:php-src 2012-04-30 17:35:32 +02:00
Anatoliy Belsky
8382da0492 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug 61868 ext\dom\tests\DOMDocument_validate_on_parse_variation.phpt fails
  - Regenerated files

Conflicts:
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner_defs.h
 2012-04-30 17:31:31 +02:00
andrey
2ab5b57cd4 Merge branch 'master' of git.php.net:php-src 2012-04-30 17:31:06 +02:00
Anatoliy Belsky
819a7ae6a1 Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 2012-04-30 17:25:25 +02:00
Anatoliy Belsky
47c8b6039a Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug 61868 ext\dom\tests\DOMDocument_validate_on_parse_variation.phpt fails
 2012-04-30 17:25:11 +02:00
Anatoliy Belsky
d26e006d7f Fix bug 61868 ext\dom\tests\DOMDocument_validate_on_parse_variation.phpt fails 2012-04-30 17:23:49 +02:00
andrey
174bf906f8 refactor MYSQLND_NET, split it two parts for easy resharing 2012-04-30 17:01:56 +02:00
Felipe Pena
1622843162 - Regenerated files 2012-04-30 10:35:28 -03:00
Felipe Pena
ea23192910 - Regenerated files 2012-04-30 10:35:11 -03:00