clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 02:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
68,322 Commits 491 Branches 1,363 Tags 841 MiB
94d96f7782
Commit Graph

28449 Commits

Author SHA1 Message Date
Anatoliy Belsky
94d96f7782 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #61791 ext\sqlite3\tests\sqlite3_15_open_error.phpt fails

Conflicts:
	ext/sqlite3/tests/sqlite3_15_open_error.phpt
 2012-04-26 15:17:46 +02:00
Anatoliy Belsky
4daab0abec Fix bug #61791 ext\sqlite3\tests\sqlite3_15_open_error.phpt fails 2012-04-26 15:14:26 +02:00
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
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
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
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
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
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
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
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
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
Yasuo Ohgaki
cce0f8e507 Implement Request #47570 libpq's PG_VERSION should be exported to userland 2012-04-18 12:20:35 +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
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
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
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
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
d588d01b7c Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug 61680 ext\zlib\tests\gzencode_variation1-win32.phpt fails
 2012-04-16 14:05:32 +02:00
Anatoliy Belsky
163c1a393f Fix bug 61680 ext\zlib\tests\gzencode_variation1-win32.phpt fails 2012-04-16 14:04:29 +02:00
Anatoliy Belsky
ede519d1d6 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug 61676 ext\tidy\tests\bug54682.phpt fails

Conflicts:
	ext/tidy/tests/bug54682.phpt
 2012-04-16 13:42:52 +02:00
Anatoliy Belsky
c981016e41 Fix bug 61676 ext\tidy\tests\bug54682.phpt fails 2012-04-16 13:38:13 +02:00
Anatoliy Belsky
948f3619f6 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug 61743 tests in ext\standard\tests\file\windows_acls\* fail
 2012-04-16 13:33:03 +02:00