62b1293e3d
Fix Z_BLOCK breakage when built against zlib < 1.2.4
2015-05-07 09:02:38 -04:00
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
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
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
8026001943
Fixed bug #69549 (Memory leak with opcache.optimization_level=0xFFFFFFFF)
2015-05-07 12:14:14 +03:00
f122cc257c
set ext/zip version to 1.13 (as we have new methods... semver...)
2015-05-07 10:41:48 +02:00
9e9170bd07
Strings and other pointers should be handled differently
2015-05-07 11:36:01 +03:00
e96616739c
Fixed redundand internal constructor behavior (they shouldn't return NULL anymore)
2015-05-07 10:38:47 +03:00
dd0b602381
Fix build
2015-05-06 22:46:56 -07:00
809616c9da
Temporary fix for SIGFPE
2015-05-07 11:25:04 +08:00
3abde43231
Added experimental (disabled by default) file based opcode cache.
2015-05-06 23:46:49 +03:00
d1363e30fd
better fix (also fix i386 build)
2015-05-06 16:59:50 +02:00
31f95eaefb
try to fix build when LONG_MAX not defined
2015-05-06 16:24:21 +02:00
3a55ea02aa
add ZipArchive::setCompressionName and ZipArchive::setCompressionIndex methods
2015-05-06 15:16:43 +02:00
3638ac2300
don't use deprecated libzip call
2015-05-06 15:16:43 +02:00
9e0cc7a1d9
update libzip to version 1.0.1
2015-05-06 15:16:43 +02:00
31f516b488
Use fast zpp for frequently used gettext(_)
2015-05-06 14:29:19 +08:00
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
9f0dbdf6c8
Use Z_ARRVAL_P since we already know it's an array
2015-05-06 11:10:33 +08:00
c734587303
Fixed comment
2015-05-06 11:03:44 +08:00
13eb630eeb
use zval_get_long
2015-05-06 10:58:01 +08:00
55d94a4532
Merge branch 'master' of git.php.net:php-src
2015-05-06 10:51:52 +08:00
63282d3321
Fixed returning void instead of NULL
2015-05-05 23:50:50 +03:00
c0c68a9406
Fix build
2015-05-05 21:40:28 +02:00
d7351a5c74
Use Fast ZPP
2015-05-05 21:38:52 +03:00
f6663c7201
Loop splitting and specialization
2015-05-05 18:51:08 +03:00
81dd375b5f
Fixed compilation warning
2015-05-05 16:28:54 +03:00
b1d486c7d7
e more efficient zend_hash_*() functions
2015-05-05 16:20:29 +03:00
70c86732cb
Use zend_string to represent pdo_column_data.name and avoid duplication.
2015-05-05 16:19:51 +03:00
275afbacd1
Use zend heap instead of system
2015-05-05 16:06:10 +03:00
9b3a92a1ca
micro optimizations
2015-05-05 18:22:38 +08:00
a610e8c4c6
Use better zend_hash_*() functions.
2015-05-05 12:58:11 +03:00
17e4c62872
Removed check for count() in SXE class
2015-05-05 12:57:30 +03:00
5f8bc73fc3
fixed comment
2015-05-05 17:37:42 +08:00
7b9e4e19e1
Unused macros
2015-05-05 17:25:25 +08:00
8c0ebb4c5d
Optimize cast simplexml to IS_BOOL
2015-05-05 17:23:54 +08:00
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
33e2aa452d
Relax tests failing on i386 with new zic
2015-05-05 11:22:29 +02:00
b6e893c143
Unused var
2015-05-05 17:02:54 +08:00
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
859aa06205
Avoid repeatable lookups for count() method in the same class entry.
2015-05-05 11:10:21 +03:00
24992a1422
Merge branch 'PHP-5.5' into PHP-5.6
2015-05-05 11:06:14 +08:00
cf3e976c3b
Update version
2015-05-05 11:06:04 +08:00
7ba353ef69
Add unique prefix to exported function
2015-05-02 10:03:30 -07:00
0a02cdf775
First pass migrating PDO_OCI to PHP 7
2015-05-01 18:22:41 -07:00
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
98fe9405e2
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Upgrade to PCRE 8.37 due to various bugfixes
Conflicts:
ext/pcre/config.w32
ext/pcre/config0.m4
ext/pcre/pcrelib/pcre_jit_compile.c
ext/pcre/pcrelib/sljit/sljitConfig.h
ext/pcre/pcrelib/sljit/sljitConfigInternal.h
ext/pcre/pcrelib/sljit/sljitLir.c
ext/pcre/pcrelib/sljit/sljitLir.h
ext/pcre/pcrelib/sljit/sljitNativeARM_32.c
ext/pcre/pcrelib/sljit/sljitNativeARM_64.c
ext/pcre/pcrelib/sljit/sljitNativeARM_T2_32.c
ext/pcre/pcrelib/sljit/sljitNativeMIPS_common.c
ext/pcre/pcrelib/sljit/sljitNativePPC_common.c
ext/pcre/pcrelib/sljit/sljitNativeSPARC_common.c
ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c
ext/pcre/pcrelib/sljit/sljitNativeX86_32.c
ext/pcre/pcrelib/sljit/sljitNativeX86_64.c
ext/pcre/pcrelib/sljit/sljitNativeX86_common.c
ext/pcre/pcrelib/sljit/sljitUtils.c
2015-04-29 22:34:54 -07:00
428d0983cd
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Upgrade to PCRE 8.37 due to various bugfixes
2015-04-29 22:28:04 -07:00
ce6db558f9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Upgrade to PCRE 8.37 due to various bugfixes
2015-04-29 22:27:21 -07:00
95fa727992
Upgrade to PCRE 8.37 due to various bugfixes
2015-04-29 22:27:07 -07:00
Daniel Lowrey