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,465 Commits 491 Branches 1,363 Tags 841 MiB
89e7a195bc
Commit Graph

68465 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Johannes Schlüter
89e7a195bc Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  PHP 5.3.15-dev

Conflicts:
	configure.in
	main/php_version.h
 2012-05-16 16:50:33 +02:00
Johannes Schlüter
72a9b595ca PHP 5.3.15-dev 2012-05-16 16:49:35 +02:00
Johannes Schlüter
67039363cd Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3 
* 'PHP-5.3' of git.php.net:/php-src:
  Fix for bug#62046
 2012-05-16 16:46:08 +02:00
Johannes Schlüter
1f6f619451 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  fd fix
  fix bug #61065 (cherry picked from commit a10e778bfb)
 2012-05-16 16:40:29 +02:00
Stanislav Malyshev
6e51989501 fd fix 2012-05-16 16:35:16 +02:00
Stanislav Malyshev
4eb802bb14 fix bug #61065 
(cherry picked from commit a10e778bfb)
 2012-05-16 16:30:29 +02:00
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
Felipe Pena
1abcd81872 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  - Fixed bug #55299 (multiple null pointer in win32/registry.c)
 2012-05-16 08:40:45 -03:00
Felipe Pena
93c91c733c - Fixed bug #55299 (multiple null pointer in win32/registry.c) 2012-05-16 08:40:12 -03: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
e36a5a1197 fix test 2012-05-15 23:09:46 -07:00
Stanislav Malyshev
be8b1c74cf to 5.4.5-dev 2012-05-15 22:46:49 -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
63401268db Changes to remaining two tests, #62022 2012-05-15 14:39:51 +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
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
Michael Wallner
956d74572a BFN 2012-05-15 11:26:13 +02:00
Sebastian Bergmann
38398529b8 Fix NEWS entry for #61602. 2012-05-15 11:14:36 +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
0ad53bfd7d fix bug #60761 zlib.output_compression fails on refresh 2012-05-15 09:33:47 +02:00
Christopher Jones
d9788dd73f Bump to 5.4.4-dev 2012-05-14 12:43:36 -07:00
Stanislav Malyshev
a72b21438d update NEWS/UPGRADING 2012-05-13 14:48:22 -07:00
Stanislav Malyshev
a0dff6fdca fix bug #61782 - __clone/__destruct do not match other methods when checking access controls 2012-05-13 14:40:44 -07:00
Stanislav Malyshev
9344bf193c fix bug #54547 2012-05-13 14:40:44 -07:00
Stanislav Malyshev
58482206f5 update NEWS 2012-05-12 19:39:12 -07:00
Xinchen Hui
6a5095582a Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed Bug #62005 (unexpected behavior when incrementally assigning to a member of a null object)
  fix stack overflow in php_intlog10abs()

Conflicts:
	Zend/zend_execute.c
 2012-05-12 13:19:55 +08:00
Xinchen Hui
3332943c9d Fixed Bug #62005 (unexpected behavior when incrementally assigning to a member of a null object) 2012-05-12 13:13:44 +08: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
Anatoliy Belsky
4458f3bcf6 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #61990 ext\spl\examples\tests\dualiterator_001.phpt fails
 2012-05-11 14:38:43 +02:00
Anatoliy Belsky
81ba6b14c7 Fix bug #61990 ext\spl\examples\tests\dualiterator_001.phpt fails 
This fixes a general issue. In this ticket and not for the first time
is being seen, that people are trying to use data from "examples"
in the tests. When extracting a test pack only "tests" and its siblings
was taken into account. Now "examples" are copied as well.
 2012-05-11 14:24:12 +02:00
Xinchen Hui
24e03d875f Merge branch 'remove-useless-func-decleare' of https://github.com/reeze/php-src into PHP-5.4 2012-05-11 20:07:27 +08:00
Reeze Xia
0cb4849e53 Cleanup useless function declaration for traits 2012-05-11 16:52:12 +08: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
fc0c9054e6 updated NEWS 2012-05-10 15:56:50 +02:00
Anatoliy Belsky
19f85f8676 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  updated NEWS
 2012-05-10 15:52:37 +02:00
Anatoliy Belsky
652632a89b updated NEWS 2012-05-10 15:48:56 +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
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
Xinchen Hui
d394c17293 Correct test title 2012-05-09 11:28:57 +08:00
Xinchen Hui
1e60d0c105 Implemented FR #61977 (Need CLI web-server support for files with .htm & svg extensions) 2012-05-09 11:27:39 +08:00
Xinchen Hui
7b2ab56997 Fix test failed, the fsockopen will be refused immediately if the server is not set up. 2012-05-09 11:21:24 +08:00
Felipe Pena
f46a064760 - BFN 2012-05-08 21:07:29 -03:00