clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-25 03:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
93,867 Commits 493 Branches 1,366 Tags 848 MiB
28a016a6dc
Commit Graph

40424 Commits

Author SHA1 Message Date
Xinchen Hui
daefe53869 Merge branch 'PHP-7.0' 2015-12-12 22:38:15 -08:00
Xinchen Hui
a9026070b6 Fixed test 2015-12-12 22:37:50 -08:00
Yoshio HANAWA
fa78da9901 Optimize strtolower()/strtoupper() 2015-12-13 14:22:50 +09:00
Christopher Jones
78f157f687 Merge branch 'PHP-7.0' 2015-12-13 08:22:30 +11:00
Christopher Jones
e0691d27d5 Merge branch 'PHP-5.6' into PHP-7.0 2015-12-13 08:22:14 +11:00
Christopher Jones
82d58e6cbc Update README 2015-12-13 08:21:41 +11:00
Christopher Jones
6ddc45b9c1 Merge branch 'PHP-7.0' 2015-12-12 16:08:14 +11:00
Christopher Jones
e4a48ab6b3 Prepare for a PECL release 2015-12-12 16:07:57 +11:00
Christopher Jones
8f7e98ac4a Prepare for a PECL release 2015-12-12 16:06:08 +11:00
Anatol Belski
157d0372e0 backported 7c981192eb from 7.0 
the way it doesn't hurt BC
 2015-12-11 17:39:57 +01:00
Nikita Popov
b343cd913b Merge branch 'PHP-7.0' 2015-12-11 16:33:47 +01:00
Nikita Popov
04407b79df Fixed bug #71094 
I didn't see any non-dummy readline tests to work off, so this
change is tested manually only.

While at it also fix other zval_dtors and use ZVAL_COPY.
 2015-12-11 16:33:07 +01:00
Dmitry Stogov
1fdb63fbd9 ws fixes 2015-12-11 17:40:23 +03:00
Dmitry Stogov
21ba287c3c dos2unix 2015-12-11 17:29:42 +03:00
Dmitry Stogov
f243aaf985 Added e-SSA based DFA optimisation framework (incomplete) 2015-12-11 17:24:55 +03:00
Dmitry Stogov
061a90f8d1 Describe special meaning of IS_UNUSED oprerand 2015-12-11 02:31:28 +03:00
Dmitry Stogov
dc36810993 Use more compact description encoding schema to free some bits 2015-12-11 01:45:26 +03:00
Nikita Popov
fc2cedfb1d Make 2nd arg of xml_set_object by value 
The argument is not being modified. Probably holdover from PHP 4
days.
 2015-12-10 23:35:25 +01:00
Dmitry Stogov
047c84521c Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  Make duplicate class constant error for internal class
  Make ZEND_CLONE return a TMP_VAR
 2015-12-11 00:48:20 +03:00
Dmitry Stogov
cba1a8498c Improve Optimizer debugging facility (print the meaning of extended_value) 2015-12-11 00:47:02 +03:00
Nikita Popov
04e3d82b55 Make duplicate class constant error for internal class 
And drop two duplicate constant declarations from intl. These
were leaking previously.
 2015-12-10 22:22:49 +01:00
Nikita Popov
3d4a2d2002 Merge branch 'PHP-7.0' 
Conflicts:
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
 2015-12-10 18:24:29 +01:00
Nikita Popov
798d168d73 Make update_opN_const implementation symmetric 
So the main structure is the same...
 2015-12-10 18:18:10 +01:00
Nikita Popov
37f3425263 Fix Foo::${42} and similar 
Fixes segfault on direct use, segfault on opcache evaluated use,
leak on temporary use.

Fixes analogeous segfault for ${42} on opcache eval as well.
 2015-12-10 18:14:40 +01:00
Dmitry Stogov
cedb518ea1 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  The first arg is optional
  Return -1 seems bug here
 2015-12-10 15:34:15 +03:00
Xinchen Hui
ec0ac5dafb Merge branch 'PHP-7.0' 2015-12-10 19:37:44 +08:00
Xinchen Hui
c096a281be The first arg is optional 2015-12-10 19:36:41 +08:00
Xinchen Hui
c0ff9b07cf Merge branch 'PHP-7.0' 2015-12-10 17:35:55 +08:00
Xinchen Hui
e4ad9ed8ad Return -1 seems bug here 2015-12-10 17:35:35 +08:00
Dmitry Stogov
3b5c844757 Initialize bitset before processing the seconf BB (we skip the first one) 2015-12-10 11:29:53 +03:00
Xinchen Hui
ae537994a6 Merge branch 'PHP-7.0' 2015-12-10 15:02:33 +08:00
Xinchen Hui
29b615cfcf iFixed key leak with invalid resource 2015-12-10 15:02:01 +08:00
Xinchen Hui
c13fcc21c3 Merge branch 'PHP-7.0' 2015-12-10 08:58:37 +08:00
Xinchen Hui
7c1ddcc67f Fixed bug #71077 (ReflectionMethod for ArrayObject constructor returns wrong number of parameters) 2015-12-10 08:58:28 +08:00
Dmitry Stogov
fd20e6cee6 Apply local optimizatons to extended bacic block (this allows some optimizarions across few following BBs). 2015-12-10 01:17:35 +03:00
Dmitry Stogov
7fd7734e58 Explain the disabled optimization pattern 2015-12-09 22:22:07 +03:00
Dmitry Stogov
4fd30c9565 Improve debugging of non-local variables 2015-12-09 17:21:57 +03:00
Dmitry Stogov
d2597ad20b Improved optimizer dubugging facility 2015-12-09 14:52:00 +03:00
Anatol Belski
9aae3788cc Merge branch 'PHP-7.0' 
* PHP-7.0:
  ext/imap/config.m4: fix conftest segfault in utf8_to_mutf7 check, bug #66909.
  ext/dba/config.m4: Autodetect Berkeley DB v5.3.
  fix path separator in test
  Bumped SAPI version to 6.9
  Added "mod_auth_basic" to apache module list.
  Add sanitizing checks for request data.
  Clear secret after use.
  Fixed __DIR__ in CLI mode.
  Add PDO_Firebird fix in NEWS
 2015-12-09 12:05:18 +01:00
Anatol Belski
906670b817 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  ext/imap/config.m4: fix conftest segfault in utf8_to_mutf7 check, bug #66909.
  ext/dba/config.m4: Autodetect Berkeley DB v5.3.
  fix path separator in test
  Bumped SAPI version to 6.9
  Added "mod_auth_basic" to apache module list.
  Add sanitizing checks for request data.
  Clear secret after use.
  Fixed __DIR__ in CLI mode.
  Add PDO_Firebird fix in NEWS
 2015-12-09 12:05:01 +01:00
Michael Orlitzky
24f21a3012 ext/imap/config.m4: fix conftest segfault in utf8_to_mutf7 check, bug #66909. 
The test program for utf8_to_mutf7 attempts to call it without
arguments. The function expects one argument, however, and this leads
to a segfault as reported in PHP bug #66909.

The test program is using the PHP_IMAP_TEST_BUILD macro which
complicates things a little. To keep this diff small, the
PHP_IMAP_TEST_BUILD macro was modified to pass a fifth argument
"extra-source" to the PHP_TEST_BUILD macro. The check for
utf8_to_mutf7 was then modified to check for a dummy function,
utf8_to_mutf7_php, which passes the correct number of arguments to
utf8_to_mutf7.

PHP-Bug: https://bugs.php.net/bug.php?id=66909
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=376735
 2015-12-09 12:04:16 +01:00
Anatol Belski
eb6613390c Merge branch 'PHP-7.0' 
* PHP-7.0:
  ext/dba/config.m4: Autodetect Berkeley DB v5.3.
  Bumped SAPI version to 6.9
  Added "mod_auth_basic" to apache module list.
  Add sanitizing checks for request data.
  Clear secret after use.
  Fixed __DIR__ in CLI mode.
 2015-12-09 11:38:54 +01:00
Michael Orlitzky
05f00e5060 ext/dba/config.m4: Autodetect Berkeley DB v5.3. 
When the user passes --with-db4=DIR to ./configure, the directory DIR
is searched for a number of paths in order of preference. These paths
contain possible locations for Berkeley DB (BDB) to be installed, and
since PHP only supports BDB-4.x and BDB-5.x, it's important that (for
example) version 5.1 be autodetected before falling back to
/usr/include/db.h which can point to BDB-6.x.

The newer BDB-5.3 works with PHP, and if only BDB-5.3 is installed on
the user's system, the current ./configure script is fine. However, if
both BDB-5.3 and BDB-6.0 are installed, version 5.3 is not
autodetected, causing BDB-6.0 to be used. The ./configure step then fails.

This commit adds autodetection for BDB-5.3, and fixes a bug reported
on Gentoo at https://bugs.gentoo.org/show_bug.cgi?id=564824.
 2015-12-09 11:37:50 +01:00
Dmitry Stogov
78fb8118ec Merge branch 'PHP-7.0' 
* PHP-7.0:
  More verbose error messages
 2015-12-09 13:35:31 +03:00
Dmitry Stogov
4b16082e94 More verbose error messages 2015-12-09 13:34:45 +03:00
Dmitry Stogov
d6f3d4b50c Fixed formating 2015-12-09 13:27:31 +03:00
Michael Orlitzky
38b68fc042 ext/dba/config.m4: Autodetect Berkeley DB v5.3. 
When the user passes --with-db4=DIR to ./configure, the directory DIR
is searched for a number of paths in order of preference. These paths
contain possible locations for Berkeley DB (BDB) to be installed, and
since PHP only supports BDB-4.x and BDB-5.x, it's important that (for
example) version 5.1 be autodetected before falling back to
/usr/include/db.h which can point to BDB-6.x.

The newer BDB-5.3 works with PHP, and if only BDB-5.3 is installed on
the user's system, the current ./configure script is fine. However, if
both BDB-5.3 and BDB-6.0 are installed, version 5.3 is not
autodetected, causing BDB-6.0 to be used. The ./configure step then fails.

This commit adds autodetection for BDB-5.3, and fixes a bug reported
on Gentoo at https://bugs.gentoo.org/show_bug.cgi?id=564824.
 2015-12-09 11:20:36 +01:00
Anatol Belski
56e7903131 fix path separator in test 2015-12-09 11:18:25 +01:00
Dmitry Stogov
44c5fbbc07 Fixed other issues with empty block handling 2015-12-09 10:58:42 +03:00
Xinchen Hui
245a8c3cdf end is unsigned, this was broken if start == end == 0 2015-12-09 12:18:25 +08:00
Xinchen Hui
8d7918b8bf Merge branch 'PHP-7.0' 2015-12-09 12:01:09 +08:00
Xinchen Hui
f248309b74 Revert "Fixed bug #71053 (Type Hint about DateTime::diff does not match with informed)" 
THis is bc break, which will break $date1->diff($date2 , 1), which is
common used

please do not do bc break without a asking

This reverts commit 943b23dcf6.
 2015-12-09 12:00:23 +08:00
Reeze Xia
adf40a220b Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #71053 (Type Hint about DateTime::diff does not match with informed)
 2015-12-09 11:44:05 +08:00
Reeze Xia
943b23dcf6 Fixed bug #71053 (Type Hint about DateTime::diff does not match with informed) 2015-12-09 11:40:47 +08:00
Xinchen Hui
0adbf6de77 Remove useless check 2015-12-09 11:37:40 +08:00
Dmitry Stogov
433f412731 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  Fixed bug #71066 (mb_send_mail: Program terminated with signal SIGSEGV, Segmentation fault)
  move the entry into the correct NEWS block
  Update NEWS
  Fixed test if PATH is not set
  Fixed bug #71063 (filter_input(INPUT_ENV, ..) does not work)
 2015-12-09 05:17:22 +03:00
Dmitry Stogov
404e003cf1 Delete empty live-ranges 2015-12-09 05:16:30 +03:00
Xinchen Hui
eea88bb17f Merge branch 'PHP-7.0' 2015-12-08 17:47:33 -08:00
Xinchen Hui
84b997020e Fixed bug #71066 (mb_send_mail: Program terminated with signal SIGSEGV, Segmentation fault) 2015-12-08 17:47:16 -08:00
Xinchen Hui
cf11abad5b Merge branch 'PHP-7.0' 2015-12-08 08:26:19 -08:00
Xinchen Hui
c47b49c9b5 Fixed test if PATH is not set 2015-12-08 08:26:04 -08:00
Reeze Xia
3427c122bf Fixed bug #71063 (filter_input(INPUT_ENV, ..) does not work) 2015-12-09 00:04:12 +08:00
Dmitry Stogov
2cc2396f84 Fixed compilation with enabled internal debuging 2015-12-08 18:12:02 +03:00
Bob Weinand
a11805a4d9 PHP_MD5_CTX is now always used due to fix for #71204 2015-12-08 15:23:14 +01:00
Bob Weinand
d7928aae0a PHP_MD5_CTX is now always used due to fix for #71204 2015-12-08 15:22:25 +01:00
Anatol Belski
307f745230 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Update random.c
 2015-12-08 13:17:21 +01:00
Scott
c0ce2281bc Update random.c 
Supersedes #1589
 2015-12-08 13:16:48 +01:00
Anatol Belski
1da7422f93 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Expose php_random_bytes as a first-class API within internals
 2015-12-08 13:14:46 +01:00
Anthony Ferrara
908f67b1d4 Expose php_random_bytes as a first-class API within internals 
This also defines two macros: php_random_bytes_throw and php_random_bytes_silent depending on use case which will throw exceptions or not respectively
 2015-12-08 13:12:45 +01:00
Dmitry Stogov
c58b0cb4ce Removed useless checks 2015-12-08 12:47:05 +03:00
Dmitry Stogov
a75c195000 Implemented the RFC Support Class Constant Visibility. 
Squashed commit of the following:

commit f11ca0e7a5
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Tue Dec 8 12:38:42 2015 +0300

    Fixed test expectation

commit 211f873f54
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Tue Dec 8 12:28:38 2015 +0300

    Embed zend_class_constant.flags into zend_class_constants.value.u2.access_flags

commit 51deab84b2
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Mon Dec 7 11:18:55 2015 +0300

    Fixed issues found by Nikita

commit 544dbd5b47
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Sat Dec 5 02:41:05 2015 +0300

    Refactored immplementation of https://wiki.php.net/rfc/class_const_visibility
    @reeze created an RFC here and I emailed internals here and didn't get any responses positive/negative.
 2015-12-08 12:40:42 +03:00
Anatol Belski
4aec8bcfa9 Merge branch 'PHP-7.0' 
* PHP-7.0:
  update NEWS
  Fixed bug #71024 Unable to use PHP 7.0 x64 side-by-side with PHP 5.6 x32 on the same server
 2015-12-07 22:55:24 +01:00
Anatol Belski
7c981192eb Fixed bug #71024 Unable to use PHP 7.0 x64 side-by-side with PHP 5.6 x32 on the same server 2015-12-07 22:53:35 +01:00
Xinchen Hui
fd46184ab0 Merge branch 'PHP-7.0' 2015-12-07 07:43:31 -08:00
Xinchen Hui
250430acdc Fixed Bug #71049 (SQLite3Stmt::execute() releases bound parameter instead of internal buffer) 2015-12-07 07:43:09 -08:00
Dmitry Stogov
3d8fdd5d6e Fixed potential memory leaks 2015-12-07 18:25:25 +03:00
Xinchen Hui
8e14632b2c Merge branch 'PHP-7.0' 2015-12-07 10:58:36 +08:00
Xinchen Hui
e48988311d Fixed bug #71020 (Use after free in Collator::sortWithSortKeys) 2015-12-07 10:58:26 +08:00
Anatol Belski
a2cca52aef Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fix #70831: Compile fails on system with 160 CPUs
 2015-12-06 12:38:32 +01:00
Daniel Axtens
2ea924fffc Fix #70831: Compile fails on system with 160 CPUs 
This fixes the following build issue on 160-CPU POWER8 machines

ext/tokenizer/tokenizer_data.c:28:34: fatal error: zend_language_parser.h: No such file or directory
 #include <zend_language_parser.h>

It is fixed by introducing an explicit dependency on the header file.

Signed-off-by: Daniel Axtens <dja@axtens.net>
 2015-12-06 12:37:08 +01:00
Bob Weinand
6e664f60c3 Merge branch 'PHP-7.0' 2015-12-06 02:55:55 +01:00
Bob Weinand
aa8cac578e Fix double free in formatted_print.c 2015-12-06 02:54:28 +01:00
Xinchen Hui
cc2147dfaa Merge branch 'PHP-7.0' 2015-12-04 06:51:26 -08:00
Xinchen Hui
311eb2b11e Missed one place 2015-12-04 06:51:16 -08:00
Xinchen Hui
ee864f8030 Merge branch 'PHP-7.0' 2015-12-04 06:45:37 -08:00
Xinchen Hui
7ac24aa661 Fixed bug #71028 (Undefined index with ArrayIterator) 2015-12-04 06:45:26 -08:00
Xinchen Hui
d92c75f923 Merge branch 'PHP-7.0' 2015-12-04 11:53:48 +08:00
Xinchen Hui
3ae3341533 Fixed bug #71018 (ReflectionProperty::setValue() behavior changed) 2015-12-04 11:52:08 +08:00
Popa Adrian Marius
9dc6de528d Merge branch 'PHP-7.0' 
* PHP-7.0:
  Use LL_MASK for SQL_INT64 data formatting
 2015-12-03 17:13:59 +02:00
Popa Adrian Marius
9ddfd49063 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Use LL_MASK for SQL_INT64 data formatting
 2015-12-03 17:13:45 +02:00
Popa Adrian Marius
8da5752311 Use LL_MASK for SQL_INT64 data formatting 2015-12-03 17:12:02 +02:00
Popa Adrian Marius
c548d6b7a2 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fix Bug #60052	Integer returned as a 64bit integer on X64_86 for pdo_firebird
 2015-12-03 16:15:37 +02:00
Popa Adrian Marius
1745ead668 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix Bug #60052	Integer returned as a 64bit integer on X64_86 for pdo_firebird
 2015-12-03 16:15:18 +02:00
Popa Adrian Marius
4173a667fa Fix Bug #60052 Integer returned as a 64bit integer on X64_86 for pdo_firebird 2015-12-03 16:14:17 +02:00
Lior Kaplan
4dc996f74d Merge branch 'PHP-7.0' 
* PHP-7.0:
  SIZEOF_SIZE_T doesn't exist on AIX, keep using SIZEOF_LONG
 2015-12-02 19:34:13 +02:00
Lior Kaplan
e322fb0015 SIZEOF_SIZE_T doesn't exist on AIX, keep using SIZEOF_LONG 
Follow up for 3689b444
 2015-12-02 19:30:05 +02:00
Andrey Hristov
139af35c25 Add a method for checking if the underlying stream is valid. 2015-12-01 12:52:36 +01:00
Xinchen Hui
badce8c49a Merge branch 'PHP-7.0' 2015-12-01 10:35:48 +08:00
Xinchen Hui
ed4b887cf6 Fixed bug #70991 (zend_file_cache.c:710: error: array type has incomplete element type) 2015-12-01 10:35:32 +08:00
Scott
00e3b7614e Update random.c 
Ref: beb826f6fd
 2015-12-01 10:33:33 +08:00
Xinchen Hui
c78a782a2f Merge branch 'PHP-7.0' 2015-11-30 10:50:34 +08:00
Xinchen Hui
5df6f9f20e Fixed bug #70993 (Array key references break argument processing) 2015-11-30 10:50:23 +08:00
Xinchen Hui
5c707a6cf8 Merge branch 'PHP-7.0' 2015-11-28 23:44:06 -08:00
Xinchen Hui
9397f52724 Fixed Bug #70967 (Weird error handling for __toString when Error is thrown) 2015-11-28 23:38:19 -08:00
Xinchen Hui
cb5af748b1 Merge branch 'PHP-7.0' 2015-11-27 19:12:37 -08:00
Xinchen Hui
5af61aa1cc Space 2015-11-27 19:12:26 -08:00
Xinchen Hui
f9a56e00f6 Merge branch 'PHP-7.0' 2015-11-27 07:31:19 -08:00
Xinchen Hui
e9a8d7ff1d Fixed bug #70977, #70973 (Segmentation fault with opcache.huge_code_pages=1) 2015-11-27 07:30:37 -08:00
Xinchen Hui
3aa2182db6 Merge branch 'PHP-7.0' 2015-11-27 15:53:19 +08:00
Xinchen Hui
a347b0be48 Fixed bug #70949 (SQL Result Sets With NULL Can Cause Fatal Memory Errors) 2015-11-27 15:52:55 +08:00
Xinchen Hui
d3e6a9ce39 Merge branch 'PHP-7.0' 2015-11-27 11:42:39 +08:00
Xinchen Hui
b0f472b3b2 Fixed test 2015-11-27 11:42:30 +08:00
Xinchen Hui
541b11b5f6 Merge branch 'PHP-7.0' 2015-11-27 11:33:05 +08:00
Xinchen Hui
6cb6c04499 Fixed bug #70982 (setStaticPropertyValue behaviors inconsistently with 5.6) 2015-11-27 11:32:38 +08:00
Dmitry Stogov
2e6cf2710a Fixed compilation warning 2015-11-26 11:27:24 +03:00
Christopher Jones
eaa94390b3 Merge branch 'PHP-7.0' 2015-11-26 06:53:54 +11:00
Christopher Jones
071247713f Change line endings: Windows to Unix 2015-11-26 06:51:46 +11:00
Xinchen Hui
07a05836de Merge branch 'PHP-7.0' 2015-11-25 20:20:51 +08:00
Xinchen Hui
9376e8213c ZEND_SPACESHIP supports 2015-11-25 20:20:05 +08:00
Christopher Jones
850ef17c5d Merge branch 'PHP-7.0' 2015-11-25 12:44:10 +11:00
Christopher Jones
7be30eb78c Improve test portability 2015-11-25 12:43:05 +11:00
Christopher Jones
d10ee1eef1 Fix remaining gcov valgrind issues 2015-11-25 12:42:27 +11:00
Andrey Hristov
85e4fcf647 Give the possibility of the client to pass a factory 2015-11-24 10:23:44 +01:00
Xinchen Hui
7e7c2c062f Merge branch 'PHP-7.0' 2015-11-24 13:46:04 +08:00
Xinchen Hui
e637ead6ed Merge branch 'PHP-5.6' into PHP-7.0 2015-11-24 13:45:32 +08:00
Xinchen Hui
e6b46dc2ff Fixed bug #70960 (ReflectionFunction for array_unique returns wrong number of parameters) 2015-11-24 13:45:16 +08:00
Xinchen Hui
8d4fc591ef Merge branch 'PHP-7.0' 2015-11-24 11:48:14 +08:00
Xinchen Hui
fd545f4f44 Also fixed 'r' 2015-11-24 11:48:03 +08:00
Xinchen Hui
59933934be Merge branch 'PHP-7.0' 2015-11-24 11:08:53 +08:00
Xinchen Hui
3e0b2ba5d8 Indent (not sure why it was messed) 2015-11-24 11:08:30 +08:00
Xinchen Hui
31b4581c45 Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0 2015-11-24 11:05:56 +08:00
Xinchen Hui
26a526fb4a Merge branch 'PHP-7.0' 2015-11-24 11:05:13 +08:00
Xinchen Hui
91fb1edbbf Fixed bug #70963 (Unserialize shows UNKNOW in result) 
Thanks to ryat for reportinig
 2015-11-24 11:04:42 +08:00
Côme Bernigaud
e6759644ec Revert "Added back support for undocummented host:port syntax" 
This reverts commit 15876e85e5.
 2015-11-24 03:45:21 +01:00
Côme Bernigaud
5a8bcf73ba Revert "Using default port in ldap_connect when NULL is passed (this was the behavior prior to 5.6.11)" 
This reverts commit 391087ed28.
 2015-11-24 03:45:17 +01:00
Xinchen Hui
34bff5b91c Merge branch 'PHP-7.0' 2015-11-23 23:16:11 +08:00
Xinchen Hui
7e9f416218 Fixed bug #70959 (ArrayObject unserialize does not restore protected fields) 2015-11-23 23:15:33 +08:00
Xinchen Hui
26f3710ae8 Merge branch 'PHP-7.0' 2015-11-23 06:22:11 -08:00
Xinchen Hui
801e46d8c0 Add test for bug (count on symbol table) 
I should have do this ....
 2015-11-23 06:21:30 -08:00
Xinchen Hui
8c22edc546 Merge branch 'PHP-7.0' 2015-11-23 06:12:46 -08:00
Xinchen Hui
6313e16a04 Improved fix for bug (count on symbol table) 2015-11-23 06:12:03 -08:00
Xinchen Hui
2ae9a6fca6 Merge branch 'master' of git.php.net:/php-src 2015-11-23 18:49:25 +08:00
Xinchen Hui
6dbf8d142f Merge branch 'PHP-7.0' 2015-11-23 18:48:59 +08:00
Xinchen Hui
8c51578c81 Merge branch 'PHP-5.6' into PHP-7.0 2015-11-23 18:48:51 +08:00
Xinchen Hui
b9845e5006 Add bug #70957 and #70958 releated test in refection 2015-11-23 18:48:21 +08:00
Andrey Hristov
6b0d026c76 Remove unused variable 2015-11-23 11:36:25 +01:00
Côme Bernigaud
56b584491b Merge branch 'php-7.0' 
* php-7.0:
  Revert "Added back support for undocummented host:port syntax"
  Revert "Using default port in ldap_connect when NULL is passed (this was the behavior prior to 5.6.11)"
 2015-11-23 03:15:46 +01:00
Côme Bernigaud
ab39f981f8 Revert "Added back support for undocummented host:port syntax" 
This reverts commit 15876e85e5.
 2015-11-23 03:08:25 +01:00
Côme Bernigaud
a9bfdcb82c Revert "Using default port in ldap_connect when NULL is passed (this was the behavior prior to 5.6.11)" 
This reverts commit 391087ed28.
 2015-11-23 03:08:02 +01:00
Xinchen Hui
3178242cda Merge branch 'PHP-7.0' 2015-11-21 20:58:34 -08:00