mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-21 16:00:18 +08:00
Code Issues Packages Projects Releases Wiki Activity
68,512 Commits 503 Branches 1,387 Tags 839 MiB
8ee8ccda19
Commit Graph

28543 Commits

Author SHA1 Message Date
Gustavo André dos Santos Lopes
8ee8ccda19 Merge branch '5.3' into 5.4 
Conflicts:
	sapi/fpm/fpm/fpm_main.c
 2012-05-23 13:27:21 +02:00
Gustavo André dos Santos Lopes
1eff3b01b8 Fixed bug #6208: memory leak in grapheme_extract() 2012-05-23 13:25:45 +02:00
Gustavo André dos Santos Lopes
86ea921291 Fixed bug #62082 
This was a buffer overflow in internal function
get_icu_disp_value_src_php().
 2012-05-23 13:25:42 +02:00
Gustavo André dos Santos Lopes
07c0d714a5 Fixed bug #62081 
Constructor of IntlDateFormatter would leak if called twice.

Made calling it more than once error out before starting
using resources.
 2012-05-23 13:25:37 +02:00
Gustavo André dos Santos Lopes
51286bd8e5 Fixed bug #62070 
Collator::getSortKey() was returning an unterminated string
due the length given to RETURN_STRINGL being off by one.
 2012-05-23 13:25:32 +02:00
Gustavo André dos Santos Lopes
3e62aae1b4 Fix bug #62112: number_format() is not binary safe 
The bug report actually urges PHP 5.3's behavior to be
reinstated -- that is, make "\0", when used as a separator,
be the same as no separator at all. I believe that is not a
proper course of action and that "\0" being interpreted as
no seperator was a bug in PHP 5.3.

Using "" for no separator, in both 5.3 and 5.4, before and
after this change, causes no separator to be used, so
there is no functionality loss.
 2012-05-23 11:37:27 +02:00
Xinchen Hui
df481764f3 Revert "Implemented FR #61602 Allow access to name of constant used as default value" 
This reverts commit 054f3e3ce5.

See: http://news.php.net/php.cvs/69137 and the author confirmed.
Will commit later after the author fixed this then make a new PR.

Conflicts:

	ext/reflection/php_reflection.c
 2012-05-23 13:50:12 +08:00
Xinchen Hui
f733173b1f Fix typo while resolving conflicts 2012-05-23 13:43:49 +08:00
Xinchen Hui
a7df6ce664 Revert "Implemented FR #61602 Allow access to name of constant used as default value" 
This reverts commit 054f3e3ce5.

See: http://news.php.net/php.cvs/69137 and the author confirmed.
Will commit later after the author fixed this then make a new PR.

Conflicts:

	ext/reflection/php_reflection.c
 2012-05-23 13:39:00 +08:00
Felipe Pena
074d361d64 - Fix the fix (typo s/AIX/_AIX/g) 2012-05-21 08:54:59 -03:00
Anatoliy Belsky
fbb86bd7b3 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #62066 Test Bug - ext/tidy/tests/004.phpt
 2012-05-21 12:52:10 +02:00
Matt Ficken
c973fef48d Fix bug #62066 Test Bug - ext/tidy/tests/004.phpt 2012-05-21 12:51:24 +02:00
Anatoliy Belsky
77e70b391c Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #62068 Test bug - gmp_nextprime and 022
  Fix: 62067 Moved comments to FILE section
  - BFN

Conflicts:
	NEWS
 2012-05-21 12:37:59 +02:00
Matt Ficken
645d65f3e3 Fixed bug #62068 Test bug - gmp_nextprime and 022 2012-05-21 12:31:16 +02:00
Felipe Pena
ffe8303f24 - Fixed bug #62025 (__ss_family was changed on AIX 5.3) 2012-05-20 19:37:20 -03:00
zoe slattery
867447f420 Fix: 62067 Moved comments to FILE section 2012-05-19 16:34:16 +01:00
zoe slattery
778d69ddfe Fix: 62067 Moved comments to FILE section 2012-05-19 16:33:36 +01:00
Felipe Pena
88275e547f Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  - Fixed bug #62064 (memory leak in the XML Writer module)
 2012-05-18 19:23:42 -03:00
Felipe Pena
6d928fd26d - Fixed bug #62064 (memory leak in the XML Writer module) 2012-05-18 19:23:29 -03: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
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
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
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
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
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
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
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
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
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
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
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