clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 07:16:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
88,452 Commits 494 Branches 1,367 Tags 803 MiB
792630bc50
Commit Graph

37898 Commits

Author SHA1 Message Date
Xinchen Hui
ea94be490a Fixed test fails for bug68557 2015-02-21 12:36:38 +08:00
Xinchen Hui
4629f8978e Cleanup globals initialization 
No needs explicit inititlize zero for globals in no-zts build.
executor_globals should be initialized in zend side.
 2015-02-21 11:35:16 +08:00
Xinchen Hui
2a724becc1 Unused vars 2015-02-21 11:02:20 +08:00
Dmitry Stogov
e142e31137 Fixed memory leak 2015-02-20 20:50:01 +03:00
Mariano Iglesias
d20da1d92e Renaming test to match Bug #69089 2015-02-20 14:17:11 -03:00
Anthony Ferrara
e3b020b945 Fix declare error behavior so that improper usages will actually error 2015-02-20 11:43:18 -05:00
Anatol Belski
cfae254b6b Merge branch 'PHP-5.6' 
* PHP-5.6:
  split test for bug #68557 for windows
 2015-02-20 16:02:32 +01:00
Anatol Belski
b21d0848c9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  split test for bug #68557 for windows
 2015-02-20 16:02:07 +01:00
Anatol Belski
3082177bee split test for bug #68557 for windows 2015-02-20 16:01:34 +01:00
Julien Pauli
72af5cda27 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix #68557

Conflicts:
	ext/spl/spl_directory.c
 2015-02-20 15:40:46 +01:00
Julien Pauli
13c3b78f1e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix #68557
 2015-02-20 15:38:48 +01:00
Julien Pauli
c111d1cd70 fix #68557 2015-02-20 15:09:35 +01:00
Dmitry Stogov
623810eff4 Use fast SSE2 memcpy() for copying block of data from SHM to process memory 2015-02-20 16:08:57 +03:00
Dmitry Stogov
5100afb7dd Simplify reallocation during copying data from SHM to process memory 2015-02-20 15:38:06 +03:00
Mariano Iglesias
e6819794eb Adding 'v' formatting to DateTime::format(), and adding constant DateTime::RFC3339_EXTENDED to output datetime using the RFC3339 extended format (aka ISO8601 extended format) 2015-02-20 09:21:14 -03:00
Dmitry Stogov
5f76eed14e don't count op_arrays stored in opcache SHM 2015-02-20 14:59:30 +03:00
Dmitry Stogov
04836f0e55 Removed dead code 2015-02-20 13:46:32 +03:00
Dmitry Stogov
d85113702c Lazy duplication of op_array->static_variables 2015-02-20 13:28:26 +03:00
Dmitry Stogov
582aa41d6f Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed type mismatch
 2015-02-20 10:33:07 +03:00
Dmitry Stogov
90421b0d5b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed type mismatch
 2015-02-20 10:32:34 +03:00
Dmitry Stogov
9fb48edf3c Fixed type mismatch 2015-02-20 10:31:24 +03:00
Ferenc Kovacs
78bb5091a3 Merge branch 'PHP-5.6' 
* PHP-5.6:
  update NEWS
  update 5.6.6 release date in NEWS
  Fix bug #69033 (Request may get env. variables from previous requests if PHP works as FastCGI)
 2015-02-18 16:34:02 +01:00
Ferenc Kovacs
68128efa4b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #69033 (Request may get env. variables from previous requests if PHP works as FastCGI)
 2015-02-18 16:32:23 +01:00
Ferenc Kovacs
08b6fe9ef1 Fix bug #69033 (Request may get env. variables from previous requests if PHP works as FastCGI) 2015-02-18 16:24:09 +01:00
Jakub Zelenka
3ddc246b5a Set PHP_JSON_VERSION to 1.4.0 2015-02-17 20:52:06 +00:00
Jakub Zelenka
0676f39ee4 Remove unnecessary resource checks in openssl ext 
The resource val is already checking Z_TYPE_P(val) == IS_RESOURCE.
There is no need to call extended resource fetch functions though.
 2015-02-17 20:46:36 +00:00
Xinchen Hui
7299d43536 Fixed bug #69038 (switch(SOMECONSTANT) misbehaves) for master 2015-02-17 22:05:57 +08:00
Xinchen Hui
97f8c78b09 Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5 2015-02-17 21:17:06 +08:00
Xinchen Hui
ed1967c706 Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6 2015-02-17 21:16:53 +08:00
Xinchen Hui
e22759b1e5 Replace var is introduced 2015-02-17 21:16:37 +08:00
Anatol Belski
8742276eb3 abstain from using xmlCleanupParser 
Depending on circumstances, usage of xmlCleanupParser can affect
the thread local storage, or even cause crashes in single threaded
programs. On shutdown the memory will be freed anyway, however
not using xmlCleanupParser helps to avoid possible shutdown
crashes.
 2015-02-17 10:37:52 +01:00
Stanislav Malyshev
0a331f49c1 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix TS build
 2015-02-17 07:47:27 +01:00
Stanislav Malyshev
213725057e fix TS build 2015-02-17 07:47:12 +01:00
Stanislav Malyshev
70e51db210 Merge branch 'PHP-5.6' 
* PHP-5.6:
  update news
  Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
  Port for for bug #68552
  Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
  - BFN

Conflicts:
	ext/date/php_date.c
 2015-02-17 07:10:30 +01:00
Stanislav Malyshev
625ab10f99 Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone) 2015-02-17 07:02:20 +01:00
Stanislav Malyshev
78389b29f9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
  Port for for bug #68552
  Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
  - BFN
 2015-02-17 06:57:50 +01:00
Stanislav Malyshev
cf7d8eabcc Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Port for for bug #68552
  Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
  - BFN
 2015-02-17 06:53:48 +01:00
Stanislav Malyshev
29a4e710de Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone) 2015-02-17 06:53:27 +01:00
Stanislav Malyshev
bdfe457a2c Port for for bug #68552 2015-02-17 06:53:02 +01:00
Stanislav Malyshev
7b18981830 Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone) 
Conflicts:
	ext/date/php_date.c
 2015-02-17 06:43:51 +01:00
Xinchen Hui
1c0fa36c61 Merge branch 'PHP-5.5' into PHP-5.6 2015-02-17 11:36:15 +08:00
Xinchen Hui
66d3095993 Fixed bug #69038 (switch(SOMECONSTANT) misbehaves) 2015-02-17 11:34:57 +08:00
Felipe Pena
85aab94d81 - Fix merge 2015-02-17 01:11:48 -02:00
Felipe Pena
94742054a8 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed bug #67827 (broken detection of system crypt sha256/sha512 support)
  - Fixed bug #67427 (SoapServer cannot handle large messages) patch by: brandt at docoloc dot de
  Update NEWS
 2015-02-17 01:08:07 -02:00
Rasmus Lerdorf
a96de76753 Don't read the local php.ini when Generating Phar 
When building phar shared, you can end up loading
a previous phar.so that isn't compatible with the
php cli being used to generate Phar here.
 2015-02-16 18:28:32 -08:00
Felipe Pena
0c01fca444 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  - Fixed bug #67827 (broken detection of system crypt sha256/sha512 support)
  - Fixed bug #67427 (SoapServer cannot handle large messages) patch by: brandt at docoloc dot de
  Update NEWS
 2015-02-17 00:28:28 -02:00
Felipe Pena
a331ae4630 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed bug #67827 (broken detection of system crypt sha256/sha512 support)
  - Fixed bug #67427 (SoapServer cannot handle large messages) patch by: brandt at docoloc dot de
  Update NEWS
 2015-02-17 00:28:11 -02:00
Felipe Pena
8f9ab04d93 - Fixed bug #67827 (broken detection of system crypt sha256/sha512 support) 2015-02-17 00:23:47 -02:00
Jakub Zelenka
011eab1047 Delete json outdated package.xml 
The package.xml has not been update for more then 8 years and
there is no reason to keep it. It would require quite
a bit of digging in git history to update it which is
not worth it.
 2015-02-16 20:07:01 +00:00
Anatol Belski
af3ca74501 made ZEND_TSRMLS_CACHE_* macros look like function calls 
which also comply with the current semantics for such macros
 2015-02-16 17:19:32 +01:00
Felipe Pena
abbc82f448 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  - Fix merge
  BFN
 2015-02-16 13:09:52 -02:00
Felipe Pena
35a68c276d - Fix merge 2015-02-16 13:09:40 -02:00
Felipe Pena
e08bef442c - Fixed bug #67427 (SoapServer cannot handle large messages) patch by: brandt at docoloc dot de 2015-02-16 13:07:26 -02:00
Felipe Pena
a80ad10d9b - Fix merge 2015-02-16 12:21:20 -02:00
Felipe Pena
02de601ff8 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  - Fixed bug #67427 (SoapServer cannot handle large messages) patch by: brandt at docoloc dot de
  BFN
  Update NEWS
 2015-02-16 12:08:39 -02:00
Felipe Pena
76a505f09b Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed bug #67427 (SoapServer cannot handle large messages) patch by: brandt at docoloc dot de
  Update NEWS
 2015-02-16 12:08:26 -02:00
Felipe Pena
40c60b8212 - Fixed bug #67427 (SoapServer cannot handle large messages) patch by: brandt at docoloc dot de 2015-02-16 12:08:07 -02:00
Xinchen Hui
9973df7b4f Merge branch 'master' of https://git.php.net/repository/php-src 2015-02-16 14:22:56 +08:00
Xinchen Hui
10fe317300 Merge branch 'PHP-5.6' 
Conflicts:
	ext/openssl/openssl.c
 2015-02-16 14:18:08 +08:00
Xinchen Hui
8309988111 Fixed bug #68912 (Segmentation fault at openssl_spki_new) 2015-02-16 14:16:52 +08:00
Jakub Zelenka
5f82c9256d Update JSON Readme 2015-02-15 20:04:16 +00:00
Jakub Zelenka
549c6fa465 Remove unused destructor in json parser 2015-02-15 19:46:41 +00:00
Jakub Zelenka
911f7b10b1 Add bison 3.0.4 genereted files for json parser 
The definitions file (json_parser.tab.h) contains file
system dependent name for C preprocessor guard:

YY_PHP_JSON_YY_HOME_JAKUB_PROG_PHP_MASTER_EXT_JSON_JSON_PARSER_TAB_H_INCLUDED

This is because the srcdir is used for default definitions name.
It's a correct default (--definition=$(srcdir)/json_parser.tab.h)
because the build would fail otherwise. Unfortunately Bison does not have
a special option for defining cpp guard name. The only way would be
using skeleton file but that's not possible with the current
configuration as it requires using a specific bison version
(disallowing range of supported versions).
 2015-02-15 19:28:37 +00:00
Jakub Zelenka
09d27da1ba Regenerate json scanner with re2c 0.13.7.5 2015-02-15 18:08:58 +00:00
Xinchen Hui
fc087ed1ee Merge branch 'PHP-5.6' 
Conflicts:
	ext/readline/readline.c
 2015-02-15 22:56:56 +08:00
Xinchen Hui
edd16831b1 Merge branch 'PHP-5.5' into PHP-5.6 2015-02-15 22:55:42 +08:00
Xinchen Hui
a620b79040 Fixed bug #69054 (Null dereference in readline_(read|write)_history() without parameters) 2015-02-15 22:54:05 +08:00
Michael Wallner
4137956d0e fix detection of mbstate_t with clang 
AC_TRY_COMPILE expexts a function body
 2015-02-15 09:25:03 +01:00
Xinchen Hui
e017f35b7f Merge branch 'PHP-5.6' 
Conflicts:
	ext/pgsql/pgsql.c
 2015-02-14 22:20:33 +08:00
Xinchen Hui
1db720cd6d Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	ext/pgsql/pgsql.c
 2015-02-14 22:18:13 +08:00
Xinchen Hui
7667f8efc6 Fixed bug #68638 (pg_update() fails to store infinite values) 2015-02-14 22:17:01 +08:00
Xinchen Hui
40a94597ae Merge branch 'PHP-5.4' of https://github.com/wfelipew/php-src into PHP-5.5 2015-02-14 22:03:53 +08:00
Xinchen Hui
b73fa1fa8f Fixed build on windows 2015-02-14 12:57:53 +08:00
Yasuo Ohgaki
7d0e3c01e6 Added NULL byte protection to exec, system and passthru. 2015-02-14 05:37:56 +09:00
Yasuo Ohgaki
096fb06dab Merge branch 'PHP-5.6' 
* PHP-5.6:
  Add NULL byte protection to exec, system and passthru
 2015-02-14 05:28:32 +09:00
Yasuo Ohgaki
a54300b3f6 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Add NULL byte protection to exec, system and passthru
 2015-02-14 05:27:44 +09:00
Yasuo Ohgaki
3ea76a768c Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Add NULL byte protection to exec, system and passthru
 2015-02-14 05:26:54 +09:00
Yasuo Ohgaki
a8722f5330 Add NULL byte protection to exec, system and passthru 2015-02-14 05:25:04 +09:00
Dmitry Stogov
e10e151e9b Merged zend_array and HashTable into the single data structure. 
Now each HashTable is also zend_array, so it's refcounted and may be a subject for Copy on Write
zend_array_dup() was changed to allocate and return HashTable, instead of taking preallocated HashTable as argument.
 2015-02-13 22:20:39 +03:00
Dmitry Stogov
bc630ad6da Get rid of old HashTable iteration API (it doesn't work with constant arrays) 2015-02-13 20:18:29 +03:00
Popa Adrian Marius
8f968c5416 Apply PHP7 firebird fixes after API Cleanup from 8c920a22ac 2015-02-13 17:55:17 +02:00
Anatol Belski
c17e007a29 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix condition
 2015-02-13 13:40:37 +01:00
Anatol Belski
b3d28d14d6 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix condition
 2015-02-13 13:40:10 +01:00
Anatol Belski
5ff77b005b fix condition 2015-02-13 13:39:46 +01:00
Xinchen Hui
e5d8a14239 Revert "Cleanup globals initialization" 
This reverts commit 309e90638d.
 2015-02-13 18:25:44 +08:00
Xinchen Hui
136594822f Fixed use of uninitliazed pointer 2015-02-13 14:53:13 +08:00
Xinchen Hui
3224459232 Merge branch 'master' of https://git.php.net/repository/php-src 2015-02-13 14:29:27 +08:00
Xinchen Hui
da7d94cd73 Merge branch 'PHP-5.6' 
Conflicts:
	ext/soap/soap.c
	ext/standard/basic_functions.c
	ext/zlib/zlib.c
 2015-02-13 13:28:24 +08:00
Xinchen Hui
adc4265792 Merge branch 'PHP-5.5' into PHP-5.6 2015-02-13 13:12:44 +08:00
Xinchen Hui
3a71fa36a2 Micro opt 2015-02-13 13:09:56 +08:00
Xinchen Hui
371c016986 Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5 2015-02-13 12:54:04 +08:00
Xinchen Hui
68ab716f18 Fixed #69015 (php-cgi's getopt does not see $argv) 
No test script is added because of complicated
 2015-02-13 12:53:34 +08:00
Xinchen Hui
5f285482ea zend_get_parameters_ex is deprecated 2015-02-13 11:26:40 +08:00
Xinchen Hui
309e90638d Cleanup globals initialization 2015-02-13 10:58:35 +08:00
William Felipe Welter
0421404b73 Fixed bug #68638 pg_update() fails to store infinite values 
Fix indent
 2015-02-12 23:39:54 -02:00
Nikita Popov
240fbd36f1 Add test to ensure ReflectionClass works correctly with traits 
Some of these were not working correctly before Guilherme's patch.
Another was broken by it and is fixed in this commit as well.
 2015-02-12 23:25:09 +01:00
Guilherme Blanco
8c81d80e10 Made ZEND_ACC_TRAIT a saner value 
CC_TRAIT valued as 0x120 is too magical to be comprehensible by others.
 2015-02-12 23:20:19 +01:00
Anatol Belski
b5aca81de1 backport gd config.w32 to support freetype 2.5 2015-02-12 20:27:48 +01:00
Anatol Belski
07fdc1c78b fix data types 2015-02-12 18:39:40 +01:00
Anatol Belski
08c739c78e fix int to pointer cast 2015-02-12 18:39:39 +01:00
Dmitry Stogov
61a1e8d157 Fixed initialization of global variables in ZTS (this caused valgrind reports on few PHPT tests) 2015-02-12 16:51:07 +03:00
Dmitry Stogov
97fe15db43 Fix "forech" statemt behaviour according to https://wiki.php.net/rfc/php7_foreach 
Squashed commit of the following:

commit 1e41295097
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Sat Jan 31 07:28:58 2015 +0300

    Generalize HashTableIterator API to allows its usage without involvement of HashTable.nInternalPonter

commit 5406f21b11
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jan 30 18:08:43 2015 +0300

    Reduced alghorithms complexity

commit b37f1d58d2
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jan 30 18:08:30 2015 +0300

    Fixed test name

commit fb2d079645
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jan 30 18:08:05 2015 +0300

    API cleanup

commit 08302c0d6d
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jan 30 14:20:46 2015 +0300

    Make array_splice() to preserve foreach hash position

commit cc4b7be41e
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jan 30 12:24:31 2015 +0300

    Make internal function, operation on array passed by reference, to preserve foreach hash position

commit 5aa9712b0a
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jan 30 09:49:35 2015 +0300

    Implement consistent behavior for foreach by value over plain object

commit 4c5b385ff5
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jan 30 07:56:37 2015 +0300

    More careful iterators update.

commit 721fc9e80d
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Thu Jan 29 21:43:28 2015 +0300

    Added new test

commit 15a23b1218
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Thu Jan 29 21:05:02 2015 +0300

    Reimplement iteration magic with HashTableIterators (see https://wiki.php.net/rfc/php7_foreach#implementation_details)

commit 10a3260b1f
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Thu Jan 29 21:04:44 2015 +0300

    New test

commit eef80c5837
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Wed Jan 28 16:52:21 2015 +0300

    Fixed foreach by reference iteration over constant array

commit 61e7391873
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Wed Jan 28 14:59:54 2015 +0300

    Fixed temporary variable re-allocation pass

commit 92e90c09f0
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Wed Jan 28 12:44:57 2015 +0300

    Fixed operand destruction in case of exceptions in iterator

commit dd2a36a207
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Wed Jan 28 10:02:34 2015 +0300

    Use GET_OP1_ZVAL_PTR_DEREF() (IS_TMP_VAR and IS_CONST can't be IS_REFERENCE)

commit 4638f7b914
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Wed Jan 28 07:43:28 2015 +0300

    Change "foreach" statement behavior (this is just a PoC yet)

    - "foreach by value" don't relay on internal array/object pointer and doesnt perform array duplication. It just locks it incrementing reference counter. If the original array is modified by some code, the copy on write is performed and "foreach" still work with the old copy.

    - it makes no difference if array given to "foreach by value" is reference itself

    - "foreach by reference" still use internal array/object pointer and should work similar to PHP-5. (This id not completely implemented)
 2015-02-12 13:57:12 +03:00
Yasuo Ohgaki
741b5952c6 Pass maxlifetime to save handlers 2015-02-12 13:07:27 +09:00
Anatol Belski
2895912756 fix dir separator in test 2015-02-11 15:10:48 +01:00
Anatol Belski
52f5cb914e fix incompatible pointer type 2015-02-11 12:03:35 +01:00
Anatol Belski
67d94d1465 fix uninitialized value warn 2015-02-11 11:46:28 +01:00
Dmitry Stogov
0053b4e899 Fixed possible memory leak 2015-02-11 09:39:38 +03:00
Bob Weinand
4cd3995475 Add a constant of type CONST_PERSISTENT to test 2015-02-10 22:53:50 +01:00
Bob Weinand
2b3bebfa4c Revert removal of two ReflectionParameter functions 
Rather fix them for now by exempting function parameter defaults from *any* (non-ct) constant substitution (also from persistent constant substitution, which was already broken before)
 2015-02-10 22:20:53 +01:00
Dmitry Stogov
087102c6d3 Don't convert options in-place. They may be elements of constant array. 2015-02-11 00:02:45 +03:00
Anatol Belski
993727031f Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix dir separator in test
 2015-02-10 16:59:48 +01:00
Anatol Belski
4d8db154ad Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix dir separator in test
 2015-02-10 16:59:22 +01:00
Anatol Belski
bc3e88b9af fix dir separator in test 2015-02-10 16:58:59 +01:00
Anatol Belski
ca9ab1c993 better alignment + support size_t 2015-02-10 16:02:55 +01:00
Bob Weinand
830d3d79b3 Revert "Revert "Improve and generalize class constant substitution"" 
This reverts commit 400e65e955.

Removing ReflectionParameter::getDefaultValueConstantName() and isDefaultValueConstant()
They become useless with such optimizations and already anyway are (e.g. CONSTANT?:CONSTANT ... yields the constant back without telling isDefaultValueConstant() about it etc.)
 2015-02-10 15:47:17 +01:00
Dmitry Stogov
94602028f0 Get rid of old HashTable iteration API 2015-02-10 16:59:34 +03:00
Reeze Xia
2b396a8092 Update libmagic.patch to reflect changes made 2015-02-10 20:48:58 +08:00
Dmitry Stogov
1eb4352143 Use new ZEND_HASH_FOREACH_... API. 2015-02-10 15:43:12 +03:00
Anatol Belski
4a875e18fd use portable strtol 2015-02-10 13:06:57 +01:00
Dmitry Stogov
4241a090ad Avoid reallocation in preg_replace() if nothing was replaced 2015-02-10 13:30:25 +03:00
Anatol Belski
293181e50e removed ext/sybase_ct 2015-02-10 08:42:37 +01:00
Anatol Belski
7568605b55 removed ext/mssql 2015-02-10 08:41:57 +01:00
William Felipe Welter
60d5cdf137 Fixed bug #68638 pg_update() fails to store infinite values 
Check if value is "infinity" with strcasestr() to add quotes
 2015-02-09 20:35:18 -02:00
Daniel Lowrey
712712e8d6 Merge branch 'PHP-5.6' 
Conflicts:
	ext/openssl/xp_ssl.c
 2015-02-09 15:14:47 -05:00
Dmitry Stogov
9d5d736869 Avoid repeatable calls to strstr() 2015-02-09 22:42:37 +03:00
Michael Wallner
09a3e7377a fix json globals 2015-02-09 17:57:18 +01:00
Daniel Lowrey
fb2314798e Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	ext/openssl/xp_ssl.c
 2015-02-09 11:44:09 -05:00
Daniel Lowrey
1eef4f2a0c Miscellaneous cleanup 2015-02-09 11:42:17 -05:00
Daniel Lowrey
a8cb1d2b85 Merge branch 'PHP-5.5' of github.com:bbroerman30/php-src into PHP-5.5 2015-02-09 11:40:04 -05:00
Anatol Belski
8989354130 regenerated scanner 2015-02-09 11:22:50 +01:00
Anatol Belski
ef2fd13de8 fix datatype mismatches 2015-02-09 11:06:02 +01:00
Anatol Belski
12fff5251b fix inconsistend dll linkage warn 2015-02-09 10:51:29 +01:00
Anatol Belski
fc5b349789 size_t vs int 2015-02-09 10:47:39 +01:00
Anatol Belski
a1208b4726 use size_t for str length 2015-02-09 10:43:27 +01:00
Anatol Belski
6747c166d8 generate missing json files from config.w32 2015-02-09 10:12:26 +01:00
Bob Weinand
fc444fbc70 Shut up, my lovely compiler; I do not like your warnings 
Conflicts:
	Zend/zend_object_handlers.c
 2015-02-09 11:23:35 +08:00
Márcio Almada
e9f99e3d71 Márcio Almada remove dead tokens: T_CHARACTER, T_BAD_CHARACTER. 2015-02-08 21:44:44 -03:00
Michael Wallner
3121116a93 fix detection of mbstate_t with clang 
AC_TRY_COMPILE expexts a function body
 2015-02-08 21:46:16 +01:00
Jakub Zelenka
f2825042b4 Merge branch 'master' into jsond 
Conflicts:
	ext/json/json.c
 2015-02-08 14:08:31 +00:00
Anatol Belski
ce9f52adcd Merge branch 'PHP-5.6' 
* PHP-5.6:
  moved the part of the test into an appropriate place
 2015-02-08 14:13:39 +01:00
Anatol Belski
979020fcad moved the part of the test into an appropriate place 2015-02-08 14:10:52 +01:00
Matteo Beccati
b32458f0c9 Removed unused REGISTER_PDO_CONST_LONG 2015-02-08 13:31:01 +01:00
Anatol Belski
371db55871 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix another invalid free of CG(interned_empty_string)
  add tests for #68996
  Fixed #68790 (Missing return)
  Invalid free of CG(interned_empty_string)

Conflicts:
	ext/soap/soap.c
	ext/wddx/wddx.c
	main/main.c
	sapi/litespeed/lsapi_main.c
 2015-02-08 12:43:22 +01:00
Anatol Belski
ffdc2c4123 Merge branch 'pull-request/1060' into PHP-5.6 2015-02-08 12:33:15 +01:00
manuel
cc13d8696f Fix another invalid free of CG(interned_empty_string) 
Fixes #68214
 2015-02-07 19:17:31 +01:00
manuel
3550cc5fd9 add tests for #68996 2015-02-07 18:52:26 +01:00
Anatol Belski
1c331d8d39 added ODBCVER to phpinfo() 2015-02-07 11:23:50 +01:00
Anatol Belski
be718e45b0 added PCRE JIT availability info to phpinfo() 
and a test to ensure it's enabled
 2015-02-07 11:04:53 +01:00
William Felipe Welter
bb3a81c4b4 Fixed bug #68638 pg_update() fails to store infinite values. 
Add quotes only if "infinity" values are received.
 2015-02-07 01:26:12 -02:00
Anatol Belski
47af2381eb Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix setting default ODBCVER value in config.w32
 2015-02-06 20:00:26 +01:00