mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-25 10:54:15 +08:00
Code Issues Packages Projects Releases Wiki Activity
89,956 Commits 500 Branches 1,381 Tags 801 MiB
33097bcff6
Commit Graph

89956 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dmitry Stogov
3cc59b3fa0 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  Add some NEWS entries
  Allow self etc in eval / file scope
  fix typo in php.ini
 2015-05-07 17:27:29 +03:00
Dmitry Stogov
a989c0a1a9 Improved fast path locality 2015-05-07 17:26:35 +03:00
Dmitry Stogov
bdbe121098 Fixed $this release 2015-05-07 17:26:01 +03:00
Xinchen Hui
d258b7a5e4 Merge branch 'php-ini-typo' of https://github.com/lazysoundsystem/php-src 2015-05-07 22:24:21 +08:00
Nikita Popov
34100be688 Add some NEWS entries 2015-05-07 15:38:16 +02:00
Nikita Popov
6ef8ae65a2 Allow self etc in eval / file scope 
This fixes a regression from 16a9bc1ec2.
Together with the recent closure related changes this should allow
all usages of self etc, while previously (in PHP 5) some things like
self::class did not work.
 2015-05-07 15:38:16 +02:00
Dmitry Stogov
ab4ccffc4c Avoid unnecessary reference counter incrementation on $this when call methods 2015-05-07 16:28:23 +03:00
Daniel Lowrey
62b1293e3d Fix Z_BLOCK breakage when built against zlib < 1.2.4 2015-05-07 09:02:38 -04:00
Xinchen Hui
fbd1f1f282 Merge branch 'master' of git.php.net:php-src 2015-05-07 19:25:41 +08:00
Xinchen Hui
460e2e6a04 Fixed test in some cases(for more children, needs more time) 2015-05-07 19:25:04 +08: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
Dmitry Stogov
500b884f17 Fixed return without value 2015-05-06 22:53:48 +03:00
Dmitry Stogov
2a9f9860d7 Fixed bug #69534 (Cycle leaks through declared properties on internal classes) 2015-05-06 21:33:49 +03:00
Nikita Popov
ab97606b8a Fix compiler assumptions about self/etc wrt closures 
* Don't throw an error if self/parent/static are used in a closure
  (outside a class).
* Don't propagate self:: constants into closures
* Use runtime fetch for self::class in closures

Fixes bug #66811.
 2015-05-06 18:13:19 +02:00
Nikita Popov
bc2ff4a299 Don't implicitly make closures in static methods static 
It makes no sense that you can't write a closure using $this in a
static method, even though you can write one outside a class.

Now only closures that have been marked as static will be considered
to be static.

Fixes bug #65598.
 2015-05-06 17:29:05 +02: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
Remi Collet
9f2ce6b685 NEWS 2015-05-06 15:24:41 +02:00
Remi Collet
3a55ea02aa add ZipArchive::setCompressionName and ZipArchive::setCompressionIndex methods 2015-05-06 15:16:43 +02:00
Remi Collet
3638ac2300 don't use deprecated libzip call 2015-05-06 15:16:43 +02:00
Remi Collet
9e0cc7a1d9 update libzip to version 1.0.1 2015-05-06 15:16:43 +02:00
Xinchen Hui
31f516b488 Use fast zpp for frequently used gettext(_) 2015-05-06 14:29:19 +08:00
Xinchen Hui
76fb02123f Optimized json_parser 
1. use zend_string in key
2. use faster APIs
3. use ZVAL_COPY_VALUE instead of assignment (save u2 copy)
 2015-05-06 11:37:30 +08:00
Xinchen Hui
9f0dbdf6c8 Use Z_ARRVAL_P since we already know it's an array 2015-05-06 11:10:33 +08:00
Xinchen Hui
c734587303 Fixed comment 2015-05-06 11:03:44 +08:00
Xinchen Hui
13eb630eeb use zval_get_long 2015-05-06 10:58:01 +08:00
Xinchen Hui
55d94a4532 Merge branch 'master' of git.php.net:php-src 2015-05-06 10:51:52 +08:00
Dmitry Stogov
63282d3321 Fixed returning void instead of NULL 2015-05-05 23:50:50 +03:00
Nikita Popov
c0c68a9406 Fix build 2015-05-05 21:40:28 +02:00
Nikita Popov
d9c2959c27 Fix LSB handling for closures 
Closures will now use the called_scope from their instantiation
site. If they are rebound either the class of $this is used or if
no $this is provided the bound scope is used.

With this change the scope for static closures can be changed back
to use EG(scope) rather than EX(called_scope), thus fixing
bug #69568.
 2015-05-05 21:14:03 +02:00
Nikita Popov
dc546bdc4d Throw exception from FETCH_CLASS_NAME 
Instead of empty strings.

This does not affect the existing case of __CLASS__ in traits as
a scope will always exists in that case.
 2015-05-05 21:14:03 +02:00
Nikita Popov
dd1fdfb17c Use ZEND_FETCH_CLASS_NAME for dynamic self::class etc 
Extend the opcode to support getting the parent and static name and
then use it for dynamic ::class resolution.
 2015-05-05 21:14:03 +02:00
Dmitry Stogov
d7351a5c74 Use Fast ZPP 2015-05-05 21:38:52 +03:00
Dmitry Stogov
f6663c7201 Loop splitting and specialization 2015-05-05 18:51:08 +03:00
Dmitry Stogov
a8172353ba Micro optimization 2015-05-05 18:50:47 +03:00
Dmitry Stogov
81dd375b5f Fixed compilation warning 2015-05-05 16:28:54 +03:00
Dmitry Stogov
b1d486c7d7 e more efficient zend_hash_*() functions 2015-05-05 16:20:29 +03:00