Dmitry Stogov
|
4ce8a15eae
|
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed test on 32-bit platforms (split into 32-bit and 64-bit versions)
|
2016-04-26 13:44:52 +03:00 |
|
Dmitry Stogov
|
9f389cccfd
|
Fixed test on 32-bit platforms (split into 32-bit and 64-bit versions)
|
2016-04-26 13:43:18 +03:00 |
|
Hieu Le
|
ace71b4c5f
|
Fix bug #71501
|
2016-02-04 11:44:56 +01:00 |
|
Stanislav Malyshev
|
13750cb0a1
|
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Update NEWS
Improve fix for bug #70976
Fixed bug #70661 (Use After Free Vulnerability in WDDX Packet Deserialization)
Fixed bug #70741: Session WDDX Packet Deserialization Type Confusion Vulnerability
Fixed #70728
Fixed bug #70755: fpm_log.c memory leak and buffer overflow
Fix bug #70976: fix boundary check on gdImageRotateInterpolated
typofix
|
2016-01-05 19:38:29 -08:00 |
|
Anatol Belski
|
b0285db4b7
|
fix merge mistake
|
2016-01-04 17:33:23 +01:00 |
|
Julien Pauli
|
ef4449a8e8
|
Fixed #70728
Conflicts:
ext/xmlrpc/xmlrpc-epi-php.c
|
2016-01-04 17:31:34 +01:00 |
|
Lior Kaplan
|
ed35de784f
|
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Happy new year (Update copyright to 2016)
|
2016-01-01 19:48:25 +02:00 |
|
Lior Kaplan
|
49493a2dcf
|
Happy new year (Update copyright to 2016)
|
2016-01-01 19:21:47 +02:00 |
|
Julien Pauli
|
4df84a648e
|
Fixed #70728
|
2015-12-22 17:12:49 +01:00 |
|
Xinchen Hui
|
de6ee4c24f
|
Fixed bug #70526 (xmlrpc_set_type returns false on success)
|
2015-09-19 06:10:48 -07:00 |
|
Dmitry Stogov
|
4a2e40bb86
|
Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes).
|
2015-06-30 04:05:24 +03:00 |
|
Rasmus Lerdorf
|
28d7bb97a1
|
Fix more proto comments
|
2015-06-23 17:46:20 -04:00 |
|
Anatol Belski
|
becfdeb2ff
|
improve searchability for libxml2 headers
and bring the configs inline with the current libxml2 build
|
2015-05-10 22:22:03 +02:00 |
|
Anatol Belski
|
e570bb430d
|
fix snprintf redefinition in libxmlrpc under vc14
|
2015-05-10 22:22:02 +02:00 |
|
Anatol Belski
|
663074b6b1
|
cleanup mod version macros and mod defs, round x
|
2015-03-23 21:30:22 +01:00 |
|
Anatol Belski
|
567565b24f
|
more fixes to the shared compilation
|
2015-03-23 15:09:09 +01:00 |
|
Xinchen Hui
|
942809909e
|
Cleanup resource handling APIs
|
2015-02-02 13:23:16 +08:00 |
|
Xinchen Hui
|
fc33f52d8c
|
bump year
|
2015-01-15 23:27:30 +08:00 |
|
Xinchen Hui
|
0579e8278d
|
bump year
|
2015-01-15 23:26:37 +08:00 |
|
Xinchen Hui
|
73c1be2653
|
Bump year
|
2015-01-15 23:26:03 +08:00 |
|
Stanislav Malyshev
|
b7a7b1a624
|
trailing whitespace removal
|
2015-01-10 15:07:38 -08:00 |
|
Anatol Belski
|
bdeb220f48
|
first shot remove TSRMLS_* things
|
2014-12-13 23:06:14 +01:00 |
|
Veres Lajos
|
06fdf359e3
|
typo fixes - https://github.com/vlajos/misspell_fixer
|
2014-11-23 14:52:47 -08:00 |
|
Veres Lajos
|
4dc994571d
|
typo fixes - https://github.com/vlajos/misspell_fixer
Conflicts:
ext/ftp/ftp.h
ext/pcre/pcrelib/pcre_printint.c
ext/pcre/pcrelib/sljit/sljitLir.c
ext/pcre/pcrelib/sljit/sljitLir.h
ext/pcre/pcrelib/sljit/sljitNativeARM_32.c
ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c
ext/pgsql/pgsql.c
ext/phar/func_interceptors.c
ext/soap/soap.c
ext/standard/image.c
|
2014-11-23 14:33:43 -08:00 |
|
Remi Collet
|
2bec5d18b7
|
Merge branch 'PHP-5.6'
* PHP-5.6:
Ensure we have enough input data before parsing date
|
2014-10-28 08:51:22 +01:00 |
|
Remi Collet
|
47acdcb176
|
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Ensure we have enough input data before parsing date
|
2014-10-28 08:50:48 +01:00 |
|
Remi Collet
|
13a218d328
|
Ensure we have enough input data before parsing date
This check have be removed in
http://git.php.net/?p=php-src.git;a=commit;h=ba2f87b50667f147c198abd31fc31eb09522f3d7
But the parser really need 17 char.
And the string need to be nul terminated for this check
So avoid reading random byte from memory.
|
2014-10-28 08:48:22 +01:00 |
|
Stanislav Malyshev
|
2b261789a6
|
Fix bug #68027 - fix date parsing in XMLRPC lib
|
2014-10-14 10:49:01 -07:00 |
|
Stanislav Malyshev
|
2142d78281
|
Fix bug #68027 - fix date parsing in XMLRPC lib
|
2014-10-14 10:44:39 -07:00 |
|
Stanislav Malyshev
|
44035de79f
|
Fix bug #68027 - fix date parsing in XMLRPC lib
|
2014-10-14 10:43:12 -07:00 |
|
Anatol Belski
|
784c235f40
|
missing include for strlen proto
|
2014-10-13 18:43:08 +02:00 |
|
Anatol Belski
|
4b3e198023
|
removed *.dsw and *.dsp files
|
2014-09-28 19:02:09 +02:00 |
|
Florian MARGAINE
|
8eb7e7bf7f
|
Merge branch 'master' into issue-67910
Conflicts:
README.PARAMETER_PARSING_API
ext/gmp/tests/001.phpt
|
2014-09-20 10:09:21 +02:00 |
|
Florian MARGAINE
|
cf0303e782
|
Replaces php5 with php7, without whitespace changes.
|
2014-09-20 10:01:44 +02:00 |
|
Johannes Schlüter
|
d0cb715373
|
s/PHP 5/PHP 7/
|
2014-09-19 18:33:14 +02:00 |
|
Anatol Belski
|
03bf8c256b
|
fix type
|
2014-09-12 21:35:22 +02:00 |
|
Anatol Belski
|
6db8d4f829
|
's' works with size_t round 3
|
2014-08-27 20:49:36 +02:00 |
|
Anatol Belski
|
3234480827
|
first show to make 's' work with size_t
|
2014-08-27 20:49:31 +02:00 |
|
Anatol Belski
|
af59e92b24
|
master renames phase 7
|
2014-08-25 21:51:49 +02:00 |
|
Anatol Belski
|
c3e3c98ec6
|
master renames phase 1
|
2014-08-25 19:24:55 +02:00 |
|
Anatol Belski
|
97c5172ac7
|
Merge remote-tracking branch 'php/master'
Conflicts:
ext/date/lib/parse_date.c
|
2014-08-19 08:27:43 +02:00 |
|
Anatol Belski
|
53c4c571b3
|
C89 compat
|
2014-08-19 08:16:34 +02:00 |
|
Anatol Belski
|
63d3f0b844
|
basic macro replacements, all at once
|
2014-08-19 08:07:31 +02:00 |
|
Dmitry Stogov
|
c1965f58d4
|
Use reference counting instead of zval duplication
|
2014-06-05 16:04:11 +04:00 |
|
Dmitry Stogov
|
a21e6d6ed9
|
Fixed double free
|
2014-05-19 13:11:20 +04:00 |
|
Xinchen Hui
|
b0f434c3dd
|
Fixed double free (xmlrpc is done, 1 test failed due to knew issue)
|
2014-05-12 20:40:08 +08:00 |
|
Xinchen Hui
|
dec5fa6c08
|
Fixed typo
|
2014-05-12 19:57:04 +08:00 |
|
Xinchen Hui
|
b0329185cc
|
Refactoring ext/xmlrpc (incompleted)
|
2014-05-12 19:28:06 +08:00 |
|
Dmitry Stogov
|
17d027ed47
|
Split IS_BOOL into IS_FALSE and IS_TRUE
|
2014-04-30 18:32:42 +04:00 |
|
Dmitry Stogov
|
f9927a6c97
|
Merge mainstream 'master' branch into refactoring
During merge I had to revert:
Nikita's patch for php_splice() (it probably needs to be applyed again)
Bob Weinand's patches related to constant expression handling (we need to review them carefully)
I also reverted all our attempts to support sapi/phpdbg (we didn't test it anyway)
Conflicts:
Zend/zend.h
Zend/zend_API.c
Zend/zend_ast.c
Zend/zend_compile.c
Zend/zend_compile.h
Zend/zend_constants.c
Zend/zend_exceptions.c
Zend/zend_execute.c
Zend/zend_execute.h
Zend/zend_execute_API.c
Zend/zend_hash.c
Zend/zend_highlight.c
Zend/zend_language_parser.y
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h
Zend/zend_variables.c
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
ext/date/php_date.c
ext/dom/documenttype.c
ext/hash/hash.c
ext/iconv/iconv.c
ext/mbstring/tests/zend_multibyte-10.phpt
ext/mbstring/tests/zend_multibyte-11.phpt
ext/mbstring/tests/zend_multibyte-12.phpt
ext/mysql/php_mysql.c
ext/mysqli/mysqli.c
ext/mysqlnd/mysqlnd_reverse_api.c
ext/mysqlnd/php_mysqlnd.c
ext/opcache/ZendAccelerator.c
ext/opcache/zend_accelerator_util_funcs.c
ext/opcache/zend_persist.c
ext/opcache/zend_persist_calc.c
ext/pcre/php_pcre.c
ext/pdo/pdo_dbh.c
ext/pdo/pdo_stmt.c
ext/pdo_pgsql/pgsql_driver.c
ext/pgsql/pgsql.c
ext/reflection/php_reflection.c
ext/session/session.c
ext/spl/spl_array.c
ext/spl/spl_observer.c
ext/standard/array.c
ext/standard/basic_functions.c
ext/standard/html.c
ext/standard/mail.c
ext/standard/php_array.h
ext/standard/proc_open.c
ext/standard/streamsfuncs.c
ext/standard/user_filters.c
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
main/php_variables.c
sapi/phpdbg/phpdbg.c
sapi/phpdbg/phpdbg_bp.c
sapi/phpdbg/phpdbg_frame.c
sapi/phpdbg/phpdbg_help.c
sapi/phpdbg/phpdbg_list.c
sapi/phpdbg/phpdbg_print.c
sapi/phpdbg/phpdbg_prompt.c
|
2014-04-26 00:32:51 +04:00 |
|