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
Stanislav Malyshev
c27f012b7a
Fix bug #69453 - don't try to cut empty string
2015-04-29 22:51:43 -07:00
Stanislav Malyshev
ac28329354
Fix bug #69545 - avoid overflow when reading list
2015-04-29 22:50:18 -07:00
Stanislav Malyshev
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
Stanislav Malyshev
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
Stanislav Malyshev
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
Stanislav Malyshev
95fa727992
Upgrade to PCRE 8.37 due to various bugfixes
2015-04-29 22:27:07 -07:00
Dmitry Stogov
d880ead8a7
Improve fast_is_[not_]identical() functions to teturn value instead of takeing additional arguments.
...
Pair INSTANCEOF with the following JMPZ/JMPNZ.
2015-04-29 16:43:23 +03:00
Derick Rethans
c2ef8a9acc
Merge branch 'PHP-5.6'
2015-04-29 00:29:04 +01:00
Derick Rethans
ce9b6e5ee8
Merge branch 'PHP-5.5' into PHP-5.6
2015-04-29 00:28:56 +01:00
Derick Rethans
6a5798d990
Use new structures for tzdb header here as well
2015-04-29 00:28:50 +01:00
Derick Rethans
66c7eea659
Merge branch 'PHP-5.5'
2015-04-29 00:28:04 +01:00
Derick Rethans
7d6d8a3369
Merge branch 'PHP-5.5' into PHP-5.6
2015-04-29 00:27:55 +01:00
Derick Rethans
df49ce3d5a
This doesn't work in PHP 5.5 - sigh, I wish the libs were kept in sync
2015-04-29 00:25:29 +01:00
Derick Rethans
f179852f83
Merge branch 'PHP-5.6'
...
Conflicts:
ext/date/lib/parse_tz.c
2015-04-29 00:10:40 +01:00
Derick Rethans
a1fef89abe
Merge branch 'PHP-5.5' into PHP-5.6
2015-04-29 00:09:00 +01:00
Derick Rethans
912e42fc23
Split header reading in 32bit and 64bit variants.
...
We need to use the 64bit header for the second set of transitions, as there
could be a different amount of transitions. This also opens up the way towards
real 64bit support.
2015-04-29 00:08:28 +01:00
Derick Rethans
43c69443bb
Merge branch 'PHP-5.5' into PHP-5.6
2015-04-28 15:57:35 +01:00
Derick Rethans
cdd2b8a79f
Merge whitespace changes that have been made to timelib and PHP-5.6 and master
2015-04-28 15:57:26 +01:00
Anatol Belski
b78f8220e7
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
Fixed bug #69381 out of memory with sage odbc driver
2015-04-28 15:13:46 +02:00
Frederic Marchal
f505d11207
Fixed bug #69381 out of memory with sage odbc driver
...
This is just a hotfix as there are still drivers with no full
ODBC 3.x support. This patch origins from bug #68350 which was
solved by the proper 3.0 migration, another driver (Sage)
turned out to have the real issue.
2015-04-28 15:08:53 +02:00
Anatol Belski
268eb1999b
fix bug #69381
...
a simpler version is to be backported
2015-04-28 15:02:48 +02:00
Anatol Belski
7ccafe40c2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix VC9 build with PCRE
Revert "Fix segfault in ext/date since 957aa2"
2015-04-28 14:38:45 +02:00
Anatol Belski
768bbedf82
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix VC9 build with PCRE
2015-04-28 14:38:21 +02:00
Anatol Belski
9c5c3ff022
fix VC9 build with PCRE
2015-04-28 13:15:39 +02:00
Matteo Beccati
e645837ba1
Revert "Fix segfault in ext/date since 957aa2"
...
This reverts commit b5e5098c50
.
A proper fix from Derick is underway. I apologise for stepping on his toes ;)
2015-04-28 12:56:15 +02:00
Matteo Beccati
4cabbf9781
Revert "Fix segfault in ext/date since 957aa2"
...
This reverts commit b5e5098c50
.
A proper fix from Derick is underway. I apologise for stepping on his toes ;)
2015-04-28 12:56:11 +02:00
Matteo Beccati
7778a5a9b4
Revert "Fix segfault in ext/date since 957aa2"
...
This reverts commit b5e5098c50
.
A proper fix from Derick is underway. I apologise for stepping on his toes ;)
2015-04-28 12:56:05 +02:00
Remi Collet
97fcbf041a
relax tests with huge year (new zic)
2015-04-28 12:48:47 +02:00
Remi Collet
c1e84a3bde
ignore second value for huge timestamp test (new zic)
2015-04-28 12:48:38 +02:00
Remi Collet
194e64982e
relax test for date < INT32_MIN (new zic)
2015-04-28 12:48:30 +02:00
Remi Collet
ba41b340c2
relax bigbang content (new zic)
2015-04-28 12:48:23 +02:00
Remi Collet
c39e777722
Make date transitions tests more flexible
...
zic in recent glibc (2.20) introduce a new transitionn
so use a range to avoid failure when total number
of transitions is different (243/244)
2015-04-28 12:48:13 +02:00
Matteo Beccati
94f0b940f9
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix segfault in ext/date since 957aa2
2015-04-28 11:08:46 +02:00
Matteo Beccati
df490dcf0c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix segfault in ext/date since 957aa2
2015-04-28 10:57:52 +02:00
Matteo Beccati
b5e5098c50
Fix segfault in ext/date since 957aa2
2015-04-28 10:57:18 +02:00
Stanislav Malyshev
c34aba472c
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Upgrade PCRE to 8.36, it fixes some crashes
Conflicts:
ext/pcre/pcrelib/config.h
ext/pcre/pcrelib/pcre_ucd.c
2015-04-27 23:41:18 -07:00
Stanislav Malyshev
19ad1389aa
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Upgrade PCRE to 8.36, it fixes some crashes
2015-04-27 23:30:57 -07:00
Stanislav Malyshev
13c32a102c
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Upgrade PCRE to 8.36, it fixes some crashes
2015-04-27 23:25:32 -07:00
Stanislav Malyshev
23917b451b
Upgrade PCRE to 8.36, it fixes some crashes
...
We probably will need to go to 8.37 once it is released.
2015-04-27 23:16:54 -07:00
Xinchen Hui
38d79e9449
Drop unused num index
2015-04-28 11:26:58 +08:00
Nikita Popov
fc264da0e5
Cleanup substr_replace
2015-04-27 18:58:47 +02:00
Nikita Popov
40e465e357
Clean up some type conversions
...
While at it also fix some type checks in iconv and drop dead and
unported code in standard/filters.
2015-04-27 18:50:08 +02:00
Dmitry Stogov
5af7743cf5
Merge branch 'anon'
...
* anon:
Pass class_entry through IS_VAR to avoid hash lookup in ZEND_NEW.
Use "safe" anonymous class names. Don't show the mangled names through var_dump().
Refactored using specialized opcodes
Fix implementing_class handling
More cleanup (mainly retab)
Don't issue FETCH_CLASS for anon classes
More retab
Simply anon class name generation
Retab
Revert unrelated changes / rebase fixup
Rebase Joe's anon classes implementation
2015-04-27 17:18:35 +03:00
Dmitry Stogov
ffe804a50c
Use new hash iteration API.
2015-04-27 16:50:47 +03:00
Dmitry Stogov
94245bc14c
Refactored using specialized opcodes
2015-04-27 12:24:39 +03:00
krakjoe
49608e0608
Rebase Joe's anon classes implementation
2015-04-26 15:04:22 +02:00
Derick Rethans
1a4d3e4855
Merge branch 'PHP-5.6'
2015-04-26 11:04:54 +01:00
Derick Rethans
1e18ffd2f8
Merge branch 'PHP-5.5' into PHP-5.6
2015-04-26 11:04:35 +01:00
Derick Rethans
957aa220aa
Fixed location reading due to file format changes
2015-04-26 11:04:16 +01:00
Nikita Popov
300b1db09f
Tweak new deflate/inflate implementations
...
Return NULL on zpp.
Don't manually cast zvals to long.
2015-04-25 19:00:41 +02:00
Nikita Popov
e0a39eecf1
Respect USE_OTHER in spl_array_is_object
...
Also a bit of code cleanup in get_hash_table.
2015-04-25 16:13:39 +02:00
Nikita Popov
66ce7cc083
Don't store $this reference for IS_SELF AO
...
The var_dump output changes in array_022.phpt were wrong previously,
the "storage" that was referenced there was not the actually used
storage.
2015-04-25 16:13:37 +02:00
Nikita Popov
3140d0c0c8
Drop ArrayObject IS_REF flag
2015-04-25 16:13:32 +02:00
Derick Rethans
0cfbdb7200
- Updated to version 2015.4 (2015d)
2015-04-24 22:56:26 +01:00
Derick Rethans
ad9aaf8093
- Updated to version 2015.4 (2015d)
2015-04-24 17:22:33 +01:00
Derick Rethans
53c49994f2
- Updated to version 2015.4 (2015d)
2015-04-24 17:22:31 +01:00
Nikita Popov
2a87a42cd4
Dropped CN_match and SNI_server_name context options
2015-04-24 18:18:18 +02:00
Nikita Popov
4694e1c020
Remove PGSQL_ATTR_DISABLE_NATIVE_PREPARED_STATEMENT
...
Use the generic ATTR_EMULATE_PREPARES instead.
2015-04-24 18:08:18 +02:00
Daniel Lowrey
38ea6a827e
Fix vim folding block
2015-04-24 09:27:24 -06:00
Daniel Lowrey
852904173e
Merge branch 'deflate'
...
* deflate:
Add inflate_*() test cases
Add incremental zlib inflate API
Add deflate_*() test cases
Several deflate_* changes (more after the jump)
Add incremental zlib deflate API
2015-04-24 09:02:59 -06:00
Yasuo Ohgaki
e881017a75
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Set NULL after efree
2015-04-24 16:06:41 +09:00
Yasuo Ohgaki
02ff308e27
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Set NULL after efree
2015-04-24 16:05:50 +09:00
Yasuo Ohgaki
4c711200b4
Set NULL after efree
2015-04-24 16:04:01 +09:00
Dmitry Stogov
6265687768
Added HashTable flag HASH_FLAG_STATIC_KEYS that is maintaned to be set if all hash table keys are numbers or interned strings.
...
Take this flag into account when copy or destroy HashTable to avoud useless checks for each key.
2015-04-24 09:34:50 +03:00
Daniel Lowrey
0e62416101
Add inflate_*() test cases
2015-04-23 23:50:59 -06:00
Daniel Lowrey
585037c196
Add incremental zlib inflate API
2015-04-23 23:50:56 -06:00
Daniel Lowrey
4d5324088c
Add deflate_*() test cases
2015-04-23 23:49:41 -06:00