clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 06:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
90,031 Commits 494 Branches 1,367 Tags 800 MiB
4f5ab6fca4
Commit Graph

38689 Commits

Author SHA1 Message Date
Dmitry Stogov
d72a94468e Merged FE_FETCH_R[W] with the following ASSIGN[_REF] when assigne to CV. 2015-05-13 12:55:42 +03:00
Dmitry Stogov
7e5aa6b2ea Removed deprecated conditions 2015-05-13 10:09:06 +03:00
Dmitry Stogov
f69b30eaae Partial revert of 6a819bba40. 2015-05-13 09:43:05 +03:00
Stanislav Malyshev
5a1bef8eef Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix format
  update NEWS
  Add test for bug #69522
  Update tests
  Fix bug #69522 - do not allow int overflow
  Forgot test file
  Fix bug #69403 and other int overflows
  Fixed bug #69418 - more s->p fixes for filenames
  Fixed bug #69364 - use smart_str to assemble strings
  Fix bug #69453 - don't try to cut empty string
  Fix bug #69545 - avoid overflow when reading list

Conflicts:
	Zend/zend_alloc.c
	Zend/zend_operators.c
	ext/ftp/ftp.c
	ext/pcntl/pcntl.c
	ext/standard/basic_functions.c
	ext/standard/dir.c
	ext/standard/file.c
	ext/standard/pack.c
	ext/standard/string.c
	main/rfc1867.c
 2015-05-12 15:00:24 -07:00
Stanislav Malyshev
587ddf6ddc Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix format
  update NEWS
  Add test for bug #69522
  Update tests
  Fix bug #69522 - do not allow int overflow
  Forgot test file
  Fix bug #69403 and other int overflows
  Fixed bug #69418 - more s->p fixes for filenames
  Fixed bug #69364 - use smart_str to assemble strings
  Fix bug #69453 - don't try to cut empty string
  Fix bug #69545 - avoid overflow when reading list

Conflicts:
	ext/standard/pack.c
 2015-05-12 14:26:06 -07:00
Stanislav Malyshev
c08f9c2c78 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix format
  update NEWS
  Add test for bug #69522
  Update tests
  Fix bug #69522 - do not allow int overflow
  Forgot test file
  Fix bug #69403 and other int overflows
  Fixed bug #69418 - more s->p fixes for filenames
  Fixed bug #69364 - use smart_str to assemble strings
  Fix bug #69453 - don't try to cut empty string
  Fix bug #69545 - avoid overflow when reading list

Conflicts:
	ext/pcntl/pcntl.c
	ext/standard/basic_functions.c
	ext/standard/pack.c
	ext/standard/tests/dir/opendir_variation1-win32.phpt
 2015-05-12 14:24:15 -07:00
Julien Pauli
6a819bba40 Fix for #66048 2015-05-12 16:15:01 +02:00
Christoph M. Becker
c3c87e4996 return FALSE instead of NULL from ZipArchive::getStream when php_stream_zip_open() fails (fixes #67161) 2015-05-12 14:32:05 +02:00
Dmitry Stogov
06ef3aa6b0 Fixed string handling (string cached in SHM marked as permanent, strings stored in CG(arena) as not) 
Fixed anonymous class support
 2015-05-12 13:45:52 +03:00
Christoph M. Becker
613f747579 prohibit empty cookie names for setcookie() 2015-05-12 10:47:35 +02:00
Andreas Heigl
983b101f8e Implements extended error messages 
This commit introduces a new constant that can be used to retrieve more
detailed error messages.

This fixes #47222

The new constant LDAP_OPT_DIAGNOSTIC_MESSAGE is defined in PHP when the
underlying library provides (and understands) it. This is the case in
the current OpenLDAP-implementation.

Tanks to Johnny Willer who provided the solution at http://stackoverflow.com/questions/28765077/get-number-of-ad-errors-with-ldap-and-php-ldap-function-return-unprecise-error/28816473#28816473
 2015-05-12 10:06:54 +02:00
Josef Šimánek
413d23f6f0 Remove MSIE 5-specific Cache-Control fields. 
reverts 04daa55
 2015-05-12 09:53:17 +02:00
Stanislav Malyshev
9c0813fd48 Add test for bug #69522 2015-05-11 01:10:35 -07:00
Stanislav Malyshev
634aa0a2db Update tests 2015-05-11 00:12:39 -07:00
Stanislav Malyshev
ba1d9cc4b7 Fix bug #69522 - do not allow int overflow 2015-05-10 23:06:08 -07:00
Anatol Belski
0be37148ad catch more places for libxml headers search 2015-05-10 22:22:05 +02:00
Anatol Belski
becfdeb2ff improve searchability for libxml2 headers 
and bring the configs inline with the current libxml2 build
 2015-05-10 22:22:03 +02:00
Anatol Belski
e570bb430d fix snprintf redefinition in libxmlrpc under vc14 2015-05-10 22:22:02 +02:00
Anatol Belski
f22a5bd710 fix timezone usage in soap for vc14 2015-05-10 22:22:01 +02:00
Jakub Zelenka
359df4dea8 Tidy up and regenerate json parser with latest bison version 2015-05-10 18:08:16 +01:00
Anatol Belski
c93a360661 fix _timezone usage for vc14 2015-05-10 18:17:24 +02:00
Lauri Kenttä
cf7e5357a4 random_int: Fix power of two check. 
(x & ~x) is always 0.
((x & (~x + 1)) != x) works.
((x & (x - 1)) != 0) works too.
 2015-05-10 13:00:45 +02:00
Stanislav Malyshev
e2bbf0a2df Forgot test file 2015-05-10 02:24:29 -07:00
Stanislav Malyshev
c591f022f8 Fix bug #69403 and other int overflows 2015-05-10 02:20:08 -07:00
Stanislav Malyshev
be9b2a95ad Fixed bug #69418 - more s->p fixes for filenames 2015-05-10 02:09:38 -07:00
Stanislav Malyshev
1ceacc813a Merge branch 'fix48147' 
* fix48147:
  Fix #48147 - implement manual handling of  //IGNORE for broken libc
 2015-05-09 18:59:10 -07:00
Stanislav Malyshev
33594b78ec Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix #48147 - implement manual handling of  //IGNORE for broken libc
 2015-05-09 18:57:18 -07:00
Stanislav Malyshev
473ec539a1 Fix #48147 - implement manual handling of //IGNORE for broken libc 
Conflicts:
	ext/iconv/iconv.c
 2015-05-09 18:54:40 -07:00
SammyK
dd2692621d Add tests for CSPRNG, fix C99 comments 
Also replace one return; with RETURN_FALSE; for consistency.
 2015-05-09 22:29:26 +02:00
Leigh
5f1b83e9bb Improve CSPRNG implementation 2015-05-09 21:57:59 +02:00
SammyK
bc54d139aa Initial implementation for CSPRNG API 2015-05-09 21:57:50 +02:00
Stanislav Malyshev
f8f1d275cf Fix #48147 - implement manual handling of //IGNORE for broken libc 2015-05-08 12:55:39 -07:00
Xinchen Hui
9d4465e480 Sorry, missed here should be checked 2015-05-08 14:03:08 +08:00
Xinchen Hui
33097bcff6 Remove not necessary checks 2015-05-08 13:54:28 +08:00
Xinchen Hui
f05baec0db Reorder fields of curl 2015-05-08 13:36:55 +08:00
Xinchen Hui
0c92538e6f revert previously change to this 2015-05-08 10:33:19 +08:00
Daniel Lowrey
c488172975 Improve ZBLOCK handling with zlib < 1.2.4 
The original commit for this issue (62b1293) assumed Z_BLOCK was
only defined in < 1.2.4. However, this flush type *is* defined but
is only unavailable for use with deflate().

This new commit correctly checks the ZLIB_VERNUM constant to
determine if Z_BLOCK flush is available for the current deflate()
operation and triggers an appropriate error as needed.

New ZLIB_VERSION and ZLIB_VERNUM constants are also exposed in
userland to allow testing this behavior in environments running
zlib < 1.2.4 (ZLIB_VERNUM check is needed).
 2015-05-07 10:31:41 -04:00
Daniel Lowrey
62b1293e3d Fix Z_BLOCK breakage when built against zlib < 1.2.4 2015-05-07 09:02:38 -04:00
Dmitry Stogov
e5ea3f362c Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  set ext/zip version to 1.13 (as we have new methods... semver...)
 2015-05-07 12:19:33 +03:00
Dmitry Stogov
e6976e9ba2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #69549 (Memory leak with opcache.optimization_level=0xFFFFFFFF)
 2015-05-07 12:17:55 +03:00
Dmitry Stogov
329513c3a7 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #69549 (Memory leak with opcache.optimization_level=0xFFFFFFFF)

Conflicts:
	NEWS
 2015-05-07 12:16:40 +03:00
Dmitry Stogov
8026001943 Fixed bug #69549 (Memory leak with opcache.optimization_level=0xFFFFFFFF) 2015-05-07 12:14:14 +03:00
Remi Collet
f122cc257c set ext/zip version to 1.13 (as we have new methods... semver...) 2015-05-07 10:41:48 +02:00
Dmitry Stogov
9e9170bd07 Strings and other pointers should be handled differently 2015-05-07 11:36:01 +03:00
Dmitry Stogov
e96616739c Fixed redundand internal constructor behavior (they shouldn't return NULL anymore) 2015-05-07 10:38:47 +03:00
Rasmus Lerdorf
dd0b602381 Fix build 2015-05-06 22:46:56 -07:00
Xinchen Hui
809616c9da Temporary fix for SIGFPE 2015-05-07 11:25:04 +08:00
Dmitry Stogov
3abde43231 Added experimental (disabled by default) file based opcode cache. 2015-05-06 23:46:49 +03:00
Remi Collet
d1363e30fd better fix (also fix i386 build) 2015-05-06 16:59:50 +02:00
Remi Collet
31f95eaefb try to fix build when LONG_MAX not defined 2015-05-06 16:24:21 +02:00