Commit Graph

68320 Commits

Author SHA1 Message Date
Anatoliy Belsky
19df3c1b1c Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug #61800 ext\standard\tests\streams\bug61371.phpt fails
2012-04-26 13:28:49 +02:00
Anatoliy Belsky
4e9db5ba9f Fix bug #61800 ext\standard\tests\streams\bug61371.phpt fails 2012-04-26 13:27:01 +02:00
Anatoliy Belsky
459e758f03 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Partial fix for bug 61743 to get correct icacls path
2012-04-25 18:46:22 +02:00
Anatoliy Belsky
433290e199 Partial fix for bug 61743 to get correct icacls path 2012-04-25 18:38:27 +02:00
Stanislav Malyshev
7d3d38abec sync version 2012-04-24 16:30:37 -07:00
Michael Wallner
ac4d53cf70 fix NEWS order 2012-04-24 21:22:19 +02:00
Michael Wallner
52cb8ed314 BFN 2012-04-24 20:40:19 +02:00
Michael Wallner
7c93a16477 fix bug #61443
Since upgrade to PHP 5.4, we can't change zlib.output_compression on the
fly

the check for PHP_OUTPUT_WRITTEN was over-zealous
2012-04-24 20:35:49 +02:00
Michael Wallner
df00b64cb9 fixed bug #61820
using ob_gzhandler will complain about headers already sent
when no compression

the Vary header should only be sent on the PHP_OUTPUT_HANDLER_START
event
2012-04-24 19:50:00 +02:00
Anatoliy Belsky
f21376d668 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug #61413 ext\openssl\tests\openssl_encrypt_crash.phpt fails 5.3 only
2012-04-24 14:08:26 +02:00
Anatoliy Belsky
270a406ac9 Fix bug #61413 ext\openssl\tests\openssl_encrypt_crash.phpt fails 5.3 only 2012-04-24 14:05:35 +02:00
Anatoliy Belsky
c7f9f54a23 Bug 61610 adopted expected warnings for 5.4 2012-04-24 13:36:43 +02:00
Gustavo André dos Santos Lopes
485638a09c Merge branch '5.3' into 5.4 2012-04-23 22:10:23 +01:00
Gustavo André dos Santos Lopes
8d748e5de5 Fixed bug #61764: 'I' unpacks n as signed if n > 2^31-1 on LP64
Also fixed possible invalid read on big endian LP64.
2012-04-23 22:09:38 +01:00
Felipe Pena
883d40667d Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  - Fixed bug #61829 (Memory leak when calling MessageFormatter's constructor twice)
2012-04-23 15:19:23 -03:00
Felipe Pena
c8865e3b84 - Fixed bug #61829 (Memory leak when calling MessageFormatter's constructor twice) 2012-04-23 15:18:12 -03:00
Anatoliy Belsky
dd67f066f7 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug #61811 three of finfo tests failed, see also #61812.
2012-04-22 19:29:52 +02:00
Anatoliy Belsky
da1b534601 Fix bug #61811 three of finfo tests failed, see also #61812.
The remaining two was assidentially merged back from 5.4
2012-04-22 19:26:54 +02:00
Xinchen Hui
0d115ca211 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed warning implicit declaration of function 'file_printedlen'
2012-04-22 19:59:46 +08:00
Xinchen Hui
f13b0ede07 Fixed warning implicit declaration of function 'file_printedlen' 2012-04-22 19:52:07 +08:00
Xinchen Hui
3ca1976b3c Update NEWS 2012-04-22 19:39:50 +08:00
Xinchen Hui
b225330707 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug #61812 (Uninitialised value used in libmagic)
2012-04-22 19:39:02 +08:00
Xinchen Hui
c06e92a533 Fixed bug #61812 (Uninitialised value used in libmagic) 2012-04-22 19:38:14 +08:00
Johannes Schlüter
a571039870 Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
* 'PHP-5.4' of git.php.net:/php-src:
  Fix test
  typo in test
  Make css string constant
  Fixed typo
  Improved performance while sending error page
  - BFN
  - BFN
  - Fixed bug #54197 ([PATH=] sections incompatibility with user_ini.filename set to null) patch by ab@php.net
  - Fixed expected test result (patch by ab@php.net in #61769)
  - Fix test title
  add pg_escape_identifier/pg_escape_literal
  fix RCs
  Update to 5.4.2-dev
  Bug#59597 NumberFormatter::parse() with TYPE_INT64 results in a 32 bit integer
2012-04-22 02:26:07 +02:00
Johannes Schlüter
bb2f806534 Fix folding 2012-04-22 02:25:02 +02:00
Xinchen Hui
9a22bc2662 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix test
  - BFN
2012-04-21 16:03:18 +08:00
Xinchen Hui
2e9eb5e32f Fix test
Reported by cjones
2012-04-21 16:02:25 +08:00
Xinchen Hui
8d44b91731 typo in test 2012-04-21 10:15:35 +08:00
Xinchen Hui
b999e91f5b Make css string constant 2012-04-21 09:31:00 +08:00
Xinchen Hui
da85337d13 Fixed typo
report by reeze.xia@gmail.com
2012-04-21 00:11:06 +08:00
Xinchen Hui
cc58373d4d Improved performance while sending error page
this also fixed bug #61785 (Memory leak when access a non-exists file without router)
2012-04-21 00:01:10 +08:00
Felipe Pena
bca2d6b985 - BFN 2012-04-19 23:23:59 -03:00
Felipe Pena
dd34fe52b9 - BFN 2012-04-19 23:23:46 -03:00
Felipe Pena
d2798c6035 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  - Fixed bug #54197 ([PATH=] sections incompatibility with user_ini.filename set to null) patch by ab@php.net
2012-04-19 23:13:37 -03:00
Felipe Pena
c3b0fb4fbe - Fixed bug #54197 ([PATH=] sections incompatibility with user_ini.filename set to null) patch by ab@php.net 2012-04-19 23:12:47 -03:00
Felipe Pena
0a46d63f7e - Fixed expected test result (patch by ab@php.net in #61769) 2012-04-19 20:15:11 -03:00
Felipe Pena
d5bd45429c - Fix test title 2012-04-19 20:05:30 -03:00
Yasuo Ohgaki
655245afef add pg_escape_identifier/pg_escape_literal 2012-04-19 13:40:24 -07:00
Stanislav Malyshev
106e0a2e68 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Bug#59597 NumberFormatter::parse() with TYPE_INT64 results in a 32 bit integer
2012-04-19 11:37:31 -07:00
Stanislav Malyshev
5cbf2d6785 Merge branch 'pull-request/61' into PHP-5.3
* pull-request/61:
  Bug#59597 NumberFormatter::parse() with TYPE_INT64 results in a 32 bit integer
2012-04-19 11:28:30 -07:00
Stanislav Malyshev
2b8e9430c8 fix RCs 2012-04-19 10:45:21 -07:00
Christopher Jones
701332ce30 Update to 5.4.2-dev
After PHP-5.4.1 was branched, the PHP-5.4 branch should have been 5.4.2-dev.
2012-04-19 10:45:21 -07: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
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
Sherif Ramadan
2827324c7c Bug#59597 NumberFormatter::parse() with TYPE_INT64 results in a 32 bit integer 2012-04-19 04:44:43 -04: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