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
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
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
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
Dmitry Stogov
70c86732cb
Use zend_string to represent pdo_column_data.name and avoid duplication.
2015-05-05 16:19:51 +03:00
Dmitry Stogov
275afbacd1
Use zend heap instead of system
2015-05-05 16:06:10 +03:00
Xinchen Hui
9b3a92a1ca
micro optimizations
2015-05-05 18:22:38 +08:00
Dmitry Stogov
a610e8c4c6
Use better zend_hash_*() functions.
2015-05-05 12:58:11 +03:00
Dmitry Stogov
17e4c62872
Removed check for count() in SXE class
2015-05-05 12:57:30 +03:00
Xinchen Hui
5f8bc73fc3
fixed comment
2015-05-05 17:37:42 +08:00
Xinchen Hui
7b9e4e19e1
Unused macros
2015-05-05 17:25:25 +08:00
Xinchen Hui
8c0ebb4c5d
Optimize cast simplexml to IS_BOOL
2015-05-05 17:23:54 +08:00
Remi Collet
ac3ca0280a
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Relax tests failing on i386 with new zic
2015-05-05 11:23:13 +02:00
Remi Collet
33e2aa452d
Relax tests failing on i386 with new zic
2015-05-05 11:22:29 +02:00
Xinchen Hui
b6e893c143
Unused var
2015-05-05 17:02:54 +08:00
Rasmus Lerdorf
741382d968
Remove SSLv3 test dependencies
...
SSLv3 is going away. Debian8 already ships with an openssl
with no SSLv3 support which was causing these tests to fail.
Conflicts:
ext/openssl/tests/session_meta_capture.phpt
2015-05-05 10:40:55 +02:00
Dmitry Stogov
859aa06205
Avoid repeatable lookups for count() method in the same class entry.
2015-05-05 11:10:21 +03:00
Xinchen Hui
24992a1422
Merge branch 'PHP-5.5' into PHP-5.6
2015-05-05 11:06:14 +08:00
Xinchen Hui
cf3e976c3b
Update version
2015-05-05 11:06:04 +08:00
Christopher Jones
7ba353ef69
Add unique prefix to exported function
2015-05-02 10:03:30 -07:00
Christopher Jones
0a02cdf775
First pass migrating PDO_OCI to PHP 7
2015-05-01 18:22:41 -07:00
Christopher Jones
be806eba80
Export free_statement to replace php_pdo_stmt_delref which was deleted in 9fe8531309
along with php_pdo_stmt_addref
2015-05-01 18:17:34 -07:00