mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-30 20:23:28 +08:00
Code Issues Packages Projects Releases Wiki Activity
70,647 Commits 503 Branches 1,387 Tags 789 MiB
9a9362cb09
Commit Graph

29846 Commits

Author SHA1 Message Date
andrey
4d2d8e8717 Merge branch 'PHP-5.3' into PHP-5.4 
Conflicts:
	ext/mysqlnd/mysqlnd_ps.c

merge fix for bug#62046
 2012-05-16 15:59:39 +02:00
andrey
d4afbd487a Fix for bug#62046 
Bug#62046 mysqli@mysqlnd can't iterate over stored sets after call to
mysqli_stmt_reset().

Stmt's state was changed to STMT_PREPARED and leads the driver to think
that the stmt was just prepared. Because result set exist also for only
prepared but not executed sets, the check for stmt->result isn't any good.
There is a result set, because as response for COM_PREPARE the server sends
metadata and metadata is part of a result set. After COM_EXECUTE the server
sends metadata again, which could be different and in this case more correct.
 2012-05-16 14:28:55 +02:00
Stanislav Malyshev
910a4696e1 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Revert "Update test to fix breakage caused by the previous commit."
  fix test
  to 5.4.5-dev
 2012-05-15 23:30:34 -07:00
Stanislav Malyshev
d84fa39667 Revert "Update test to fix breakage caused by the previous commit." 
This reverts commit 05c8d4766c.
Connected to revert 7bbd5521d2.
 2012-05-15 23:25:06 -07:00
Stanislav Malyshev
6a0212ea88 Merge branch 'PHP-5.4' 
* PHP-5.4:
  fd fix
  fix bug #61065

Conflicts:
	UPGRADING
 2012-05-15 22:39:17 -07:00
Stanislav Malyshev
df2a38e7f8 fd fix 2012-05-15 22:35:43 -07:00
Stanislav Malyshev
a10e778bfb fix bug #61065 2012-05-15 22:34:34 -07:00
zoe slattery
129c830562 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Changes to remaining two tests, #62022
 2012-05-15 14:40:49 +01:00
zoe slattery
63401268db Changes to remaining two tests, #62022 2012-05-15 14:39:51 +01:00
zoe slattery
3556efc8e2 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Small fixes to tests, see #62022
 2012-05-15 11:48:21 +01:00
zoe slattery
d99203d44b Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Small fixes to tests, see #62022
 2012-05-15 11:43:28 +01:00
zoe slattery
e35f09d774 Small fixes to tests, see #62022 2012-05-15 11:42:14 +01:00
zoe slattery
ec3a96a2e6 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Change impl of GZIP_POST, DEFLATE_POST. See #62021
 2012-05-15 11:06:48 +01:00
zoe slattery
968dfae6d1 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Change impl of GZIP_POST, DEFLATE_POST. See #62021
 2012-05-15 11:06:14 +01:00
zoe slattery
1af8b3f883 Change impl of GZIP_POST, DEFLATE_POST. See #62021 2012-05-15 11:05:20 +01:00
Sebastian Bergmann
cc7c403a40 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed CODING_STANDARD and move parameter parse code
  Implemented FR #61602 Allow access to name of constant used as default value
 2012-05-15 11:12:03 +02:00
Sebastian Bergmann
83449b48d4 Merge branch 'add-const-name' of git://github.com/reeze/php-src into PHP-5.4 2012-05-15 11:08:08 +02:00
Michael Wallner
2d11e55b94 cleanup merge 2012-05-15 09:44:01 +02:00
Michael Wallner
0ad53bfd7d fix bug #60761 zlib.output_compression fails on refresh 2012-05-15 09:33:47 +02:00
Gustavo André dos Santos Lopes
ac33e40d2a Keep date precision in MessageFormatter. 
MessageFormatter::parse and MessageFormat::format (and their static
equivalents) now don't throw away better than second precision in the
arguments.

It's already bad enough that in MessageFormatter and IntlDateFormatter we
use seconds since epoch instead of milliseconds since epoch, deviating
from the ICU date representations. But we don't need to throw away extra
precision when parsing dates; we can keep the seconds since epoch
convention and return non integer doubles with only a small BC impact.
Note that we already could return doubles from MessageFormatter::parse if
the date was sufficiently in the past or in the future.
 2012-05-13 23:03:07 +02:00
Gustavo André dos Santos Lopes
4015f55389 Merge branch 'fr61871' 2012-05-13 21:36:21 +01:00
Gustavo André dos Santos Lopes
53860672f3 ICU < 4.8 compat in MessageFormatter 
Restricted support for named arguments to ICU 4.8+.

Also added bound checks when converting arguments to Formattables.
 2012-05-13 20:55:02 +01:00
Gustavo André dos Santos Lopes
43ff66e095 Don't check number of args in msgfmt_do_format 
The check does not work reliably across ICU versions when named arguments
are added to the mix. For instance, for recent versions of ICU like 49,
a pattern like "{foo,number} {foo}", has 0 returned from
umsg_format_arg_count(), but for ICU 4.0, this returns 2.
 2012-05-13 20:54:55 +01:00
Gustavo André dos Santos Lopes
0295ed7d22 Added new MessageFormatter tests. 2012-05-13 20:53:06 +01:00
Gustavo André dos Santos Lopes
1c4f99b988 Better error messages in MessageFormatter::format. 2012-05-13 20:53:06 +01:00
Gustavo André dos Santos Lopes
0ad1b14f16 Accept numeric strings for dates. 
Refactored umsg_helper_zval_to_millis in the process.
 2012-05-13 20:53:06 +01:00
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
Rasmus Lerdorf
8da61c62d9 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix grammo
 2012-05-13 11:48:25 -07:00
Rasmus Lerdorf
cd16174f14 Fix grammo 2012-05-13 11:45:41 -07:00
Nuno Lopes
8b4b70df56 fix stack overflow in php_intlog10abs() 
bug uncovered by LLVM/clang's new -fbounds-checking switch
this patch fixes a crash in ext/standard/tests/math/round_large_exp.phpt
 2012-05-11 13:07:21 -04:00
Nuno Lopes
950d5ee590 fix stack overflow in php_intlog10abs() 
bug uncovered by LLVM/clang's new -fbounds-checking switch
this patch fixes a crash in ext/standard/tests/math/round_large_exp.phpt
 2012-05-11 13:07:00 -04:00
Nuno Lopes
5c87ca2d27 fix stack overflow in php_intlog10abs() 
bug uncovered by LLVM/clang's new -fbounds-checking switch
this patch fixes a crash in ext/standard/tests/math/round_large_exp.phpt
 2012-05-11 12:50:29 -04:00
Anatoliy Belsky
d0d7340d50 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug #61992 ext\standard\tests\general_functions\bug44295.phpt fails
 2012-05-10 17:35:09 +02:00
Anatoliy Belsky
b43d6c8522 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #61992 ext\standard\tests\general_functions\bug44295.phpt fails
 2012-05-10 17:32:21 +02:00
Anatoliy Belsky
266578f584 Fix bug #61992 ext\standard\tests\general_functions\bug44295.phpt fails 
Exception text differ on windows
 2012-05-10 17:07:38 +02:00
Anatoliy Belsky
f6558a295d Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug ext\standard\tests\file\realpath_cache_win32.phpt fails
 2012-05-10 15:40:17 +02:00
Anatoliy Belsky
10d5f2301a Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug ext\standard\tests\file\realpath_cache_win32.phpt fails
 2012-05-10 15:36:47 +02:00
Anatoliy Belsky
f7d8b274c7 Fix bug ext\standard\tests\file\realpath_cache_win32.phpt fails 
What happens here is trivial long overflow. Despite the bug attracted
attention on windows, the same story is on linux. Just wait for a big
anough bucket->key . The linux test had %i to check the key value
which should be %d all the way.
 2012-05-10 15:27:44 +02:00
Anatoliy Belsky
e3f2c76989 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug 61901 ext\phar\tests\phar_buildfromdirectory2.phpt fails
 2012-05-09 13:06:47 +02:00
Anatoliy Belsky
f76d7be876 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug 61901 ext\phar\tests\phar_buildfromdirectory2.phpt fails
 2012-05-09 13:04:32 +02:00
Anatoliy Belsky
7fb16d5bd9 Fix bug 61901 ext\phar\tests\phar_buildfromdirectory2.phpt fails 
Another error message is produced by win specific code
 2012-05-09 13:02:33 +02:00
Felipe Pena
4dc9545aaa Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Fixed bug #61978 (Object recursion not detected for classes that implement JsonSerializable)
 2012-05-08 21:06:15 -03:00
Felipe Pena
92bc49b2b0 - Fixed bug #61978 (Object recursion not detected for classes that implement JsonSerializable) 2012-05-08 21:05:51 -03:00
Anatoliy Belsky
5fce7fe885 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug 61746 Failing tests in ext/standard/tests/file/windows_links/*
 2012-05-08 19:36:15 +02:00
Anatoliy Belsky
87fa84abde 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-05-08 19:35:13 +02:00
Matt Ficken
c12fdbde5f Fix bug 61746 Failing tests in ext/standard/tests/file/windows_links/* 
Fixed that again for systems having their %SYSTEMROOT% not in
c:\windows
 2012-05-08 19:31:41 +02:00
Anatoliy Belsky
d776a933eb Fix bug 61713 check also that mbstring's found any internal_encoding 2012-05-08 18:31:11 +02:00
Anatoliy Belsky
3a4a25358f Fix bug #61713 ext\standard\tests\strings\htmlentities10.phpt fails 
There is a logic error in charset detection part for htmlentities.
When mbstring is compiled shared and mbstring.internal_encoding
is set to pass, it prevents default_charset from being checked
resulting iso-8859-1 being choosed.
 2012-05-08 17:42:01 +02:00
Johannes Schlüter
544c6f2f22 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix #61704 (Crash apache, phpinfo() threading issue)
  Fix folding marks
 2012-05-08 17:30:46 +02:00
Johannes Schlüter
e8e661128a Fix #61704 (Crash apache, phpinfo() threading issue) 2012-05-08 17:30:05 +02:00
Johannes Schlüter
fb3b6bcf83 Fix folding marks 2012-05-08 15:18:33 +02:00
Anatoliy Belsky
2c505ecc57 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug 61905 ext\phar\tests\zip\phar_commitwrite.phpt fails
  Fix bug 61903 ext\phar\tests\tar\phar_commitwrite.phpt fails
 2012-05-07 15:40:48 +02:00
Anatoliy Belsky
09664063a8 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug 61905 ext\phar\tests\zip\phar_commitwrite.phpt fails
  Fix bug 61903 ext\phar\tests\tar\phar_commitwrite.phpt fails
 2012-05-07 15:40:16 +02:00
Anatoliy Belsky
2068419ae5 Fix bug 61905 ext\phar\tests\zip\phar_commitwrite.phpt fails 2012-05-07 15:39:07 +02:00
Anatoliy Belsky
ce59121c5f Fix bug 61903 ext\phar\tests\tar\phar_commitwrite.phpt fails 2012-05-07 15:37:29 +02:00
andrey
c75cbd62dd these methods should return a stream. This makes it easier to intercept 
the return value
 2012-05-07 15:32:00 +02:00
andrey
68536a4167 comment for the #else 2012-05-07 13:55:40 +02:00
andrey
9927cc5f4b Merge branch 'master' of git.php.net:php-src 2012-05-07 13:32:05 +02:00
andrey
ec159081a0 reorganize things a bit...just shifting code 2012-05-07 13:31:42 +02:00
Xinchen Hui
5ad35d6c77 Merge branch 'PHP-5.4' 2012-05-06 20:32:33 +08:00
Xinchen Hui
376635cde8 Merge branch 'PHP-5.3' into PHP-5.4 2012-05-06 20:32:15 +08:00
Xinchen Hui
99076bc24f Change the test folder 2012-05-06 20:31:40 +08:00
Xinchen Hui
556666cc4b Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #61730 (Segfault from array_walk modifying an array passed by reference)
 2012-05-06 20:29:26 +08:00
Xinchen Hui
4cceeb25b7 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #61730 (Segfault from array_walk modifying an array passed by reference)
 2012-05-06 20:28:18 +08:00
Xinchen Hui
7ccd594392 Fixed bug #61730 (Segfault from array_walk modifying an array passed by reference) 2012-05-06 20:01:10 +08:00
Nikita Popov
9e1b690e0c Merge branch 'PHP-5.4' 
* PHP-5.4:
  Add NEWS entry for bug #61961
  Fixed Bug #61961 (file_get_content leaks when access empty file with max length)
 2012-05-06 13:40:06 +02:00
Nikita Popov
bef6111609 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Add NEWS entry for bug #61961
  Fixed Bug #61961 (file_get_content leaks when access empty file with max length)
 2012-05-06 13:33:47 +02:00
Nikita Popov
311ee8f69c Merge branch 'pull-request/76' into PHP-5.3 2012-05-06 12:45:45 +02:00
Reeze Xia
3e9923dd8d Fixed Bug #61961 (file_get_content leaks when access empty file with max length) 2012-05-06 18:27:26 +08:00
Xinchen Hui
71e7c854b1 Merge branch 'PHP-5.4' 
* PHP-5.4:
  correct NEWS
  Fixed bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction)
  Fixed bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction)
 2012-05-06 00:53:47 +08:00
Xinchen Hui
0747b29bdf Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  correct NEWS
  Fixed bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction)

Conflicts:
	ext/curl/interface.c
 2012-05-06 00:52:51 +08:00
Xinchen Hui
19632ae7dc Fixed bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction) 2012-05-06 00:50:37 +08:00
Xinchen Hui
035ce937e1 Fixed bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction) 2012-05-06 00:40:49 +08:00
Anatoliy Belsky
56ac0e71bb Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug #61906 ext\phar\tests\zip\phar_setsignaturealgo2.phpt fails
 2012-05-04 11:42:28 +02:00
Anatoliy Belsky
f5936cceeb Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #61906 ext\phar\tests\zip\phar_setsignaturealgo2.phpt fails
 2012-05-04 11:42:05 +02:00
Anatoliy Belsky
8a10259642 Fix bug #61906 ext\phar\tests\zip\phar_setsignaturealgo2.phpt fails 2012-05-04 11:40:49 +02:00
Anatoliy Belsky
7388c085bf Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug #61904 ext\phar\tests\tar\phar_setsignaturealgo2.phpt
  Bump to next version

Conflicts:
	configure.in
	main/php_version.h
 2012-05-04 11:38:43 +02:00
Anatoliy Belsky
16fdf86ea3 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #61904 ext\phar\tests\tar\phar_setsignaturealgo2.phpt
 2012-05-04 11:32:12 +02:00
Anatoliy Belsky
6c12252790 Fix bug #61904 ext\phar\tests\tar\phar_setsignaturealgo2.phpt 2012-05-04 11:29:49 +02:00
andrey
267f691a45 bump mysqlnd versions 2012-05-03 15:33:47 +02:00
andrey
b850fa14e0 phoenix from the ashes 2012-05-03 13:34:26 +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
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
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
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
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
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
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
Anatoliy Belsky
7fa7d9a8c6 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Additional fixs for bug 61746 - prepare/clean acls
 2012-04-30 14:37:08 +02:00
Anatoliy Belsky
fc24e74260 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Additional fixs for bug 61746 - prepare/clean acls
 2012-04-30 14:36:42 +02:00
Anatoliy Belsky
ec5421d044 Additional fixs for bug 61746 - prepare/clean acls 2012-04-30 14:33:48 +02:00
Anatoliy Belsky
e509088c94 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug 61870 ext\session\tests\bug42596.phpt fails
 2012-04-30 12:11:00 +02:00
Anatoliy Belsky
36836f147c Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug 61870 ext\session\tests\bug42596.phpt fails
 2012-04-30 12:10:43 +02:00
Anatoliy Belsky
680685127f Fix bug 61870 ext\session\tests\bug42596.phpt fails 2012-04-30 12:06:28 +02:00
Anatoliy Belsky
8a0981b2ef Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug ext\filter\tests\bug52209.phpt fails
 2012-04-30 10:41:13 +02:00
Anatoliy Belsky
455040c4ab Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug ext\filter\tests\bug52209.phpt fails
 2012-04-30 10:28:00 +02:00
Anatoliy Belsky
8249581a2d Fix bug ext\filter\tests\bug52209.phpt fails 2012-04-30 10:25:54 +02:00
Xinchen Hui
a601605f14 merge test from PHP-5.4 2012-04-30 12:33:55 +08:00
Xinchen Hui
d80a3d9668 Revert "Merge branch 'fix-pro_nice-test' of https://github.com/reeze/php-src into PHP-5.3" 
After pushed, I found the test script in 5.4 is already fixed this, so
revert this change, and be consistent with 5.4's test

This reverts commit 24d85e4bd8, reversing
changes made to bae56a87f8.
 2012-04-30 12:31:33 +08:00
Xinchen Hui
24d85e4bd8 Merge branch 'fix-pro_nice-test' of https://github.com/reeze/php-src into PHP-5.3 2012-04-30 12:29:15 +08:00
Felipe Pena
7fa45a9399 Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Added missing bound check in iptcparse() (path by chris at chiappa.net)
 2012-04-29 19:14:20 -03:00
Felipe Pena
6008f9af8f Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  - Added missing bound check in iptcparse() (path by chris at chiappa.net)
 2012-04-29 19:14:03 -03:00
Felipe Pena
d44a383986 - Added missing bound check in iptcparse() (path by chris at chiappa.net) 2012-04-29 19:12:12 -03:00
reeze
e52be10b30 Fix test for proc_nice: bsd ps command didn't support option -o "%p %n" 2012-04-30 00:59:54 +08:00
Gustavo André dos Santos Lopes
ffec614412 Fix build on MS Windows 2012-04-28 16:32:44 +01:00
Anatoliy Belsky
a1f7423087 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug 61685 putenv('TZ=UTC') doesn't update timezone for localtime()
 2012-04-28 11:45:24 +02:00
Anatoliy Belsky
6f8fae606b Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug 61685 putenv('TZ=UTC') doesn't update timezone for localtime()
 2012-04-28 11:44:54 +02:00
Matt Ficken
dc6d283b1c Fix bug 61685 putenv('TZ=UTC') doesn't update timezone for localtime() 2012-04-28 11:42:42 +02:00
Anatoliy Belsky
3dac5b1105 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug 61786 Failing tests in ext\session\tests\*
 2012-04-26 15:41:06 +02:00
Anatoliy Belsky
3dbe48762f Fix bug 61786 Failing tests in ext\session\tests\* 2012-04-26 15:39:45 +02:00
Anatoliy Belsky
6996a51d59 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug #61791 ext\sqlite3\tests\sqlite3_15_open_error.phpt fails
 2012-04-26 15:18:17 +02:00
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
e857110116 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug #61800 ext\standard\tests\streams\bug61371.phpt fails
 2012-04-26 13:30:25 +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
71f620d436 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Partial fix for bug 61743 to get correct icacls path
  sync version

Conflicts:
	configure.in
 2012-04-25 18:53:56 +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
a9836496e3 Merge branch 'PHP-5.4' 2012-04-24 20:37:29 +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
342b641a93 Merge branch 'PHP-5.4' 2012-04-24 19:52:45 +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
c9d89a349b Merge branch 'PHP-5.4' 
* PHP-5.4:
  Bug 61610 adopted expected warnings for 5.4
 2012-04-24 13:45:07 +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
d77cde46e1 Merge branch '5.4' 2012-04-23 22:10:50 +01: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
93d42fb444 Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Fixed bug #61829 (Memory leak when calling MessageFormatter's constructor twice)
 2012-04-23 15:19:35 -03: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