archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 06:58:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
93966 commits 526 branches 1434 tags 873 MiB
Commit graph

327 commits

Author SHA1 Message Date
Nikita Popov
1ac152938c Move semicolon into TSRMLS_CACHE_EXTERN/DEFINE 
Also re bug #71575.
 2016-03-03 16:50:01 +01:00
Nikita Popov
c9357f82d3 Format string fixes 
Conflicts:
	ext/pgsql/pgsql.c
 2016-02-14 14:45:53 +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
Nikita Popov
e892e2e253 Merge branch 'PHP-5.6' into PHP-7.0 2015-10-03 10:13:44 +02:00
Nikita Popov
fe1933aae2 Fixed bug #70625 2015-10-03 10:12:11 +02:00
Dmitry Stogov
ad4fa8f758 Fixed incorrect usage of HASH_OF() macro. Replaced HASH_OF() with more appropriate Z_ARRVAL_P() or Z_OBJPROP_P(). 2015-09-24 22:39:59 +03:00
Anatol Belski
2366a070c8 improve condition 
same as CSPRNG, break by EOF
 2015-08-12 14:50:43 +02:00
Anatol Belski
80bc2133cd fix bug #69833 mcrypt fd caching not working 2015-08-11 16:49:28 +02:00
Anatol Belski
b0893344df integrate static tsrmls cache with ext/mcrypt 2015-08-11 12:32:00 +02:00
Anatol Belski
f15ec180ad add folds 2015-08-11 12:11:24 +02:00
Anatol Belski
a91065c63c don't close stdin 2015-08-09 18:54:20 +02:00
Anatol Belski
a94ea9c97a fix the mcrypt related part of bug #64833 2015-08-09 18:40:29 +02:00
Dmitry Stogov
89b49b02fc Cleanup (avoid reallocation) 2015-07-01 14:12:46 +03: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
Anatol Belski
4fe938b0a9 remove duplicated declaration, fix build 2015-05-21 10:56:14 +02:00
Dmitry Stogov
f51e4ae42e Fixed build 2015-05-13 18:53:58 +03:00
Julien Pauli
420961524d Merge branch 'PHP-5.6' 
* PHP-5.6:
  Close fd at the end, otherwise people complain
  Add file descriptor caching to mcrypt_create_iv()

Conflicts:
	ext/mcrypt/mcrypt.c
 2015-05-13 14:21:19 +02:00
Julien Pauli
c09fad97d6 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Close fd at the end, otherwise people complain
  Add file descriptor caching to mcrypt_create_iv()
 2015-05-13 14:19:04 +02:00
Leigh
f7952b90ca Close fd at the end, otherwise people complain 
Even though it's closed when the process terminates!
 2015-05-13 14:18:32 +02:00
Leigh
c02c4aca00 Add file descriptor caching to mcrypt_create_iv() 
This improves performance for applications that make repeated calls to
mcrypt_create_iv()
 2015-05-13 14:18:32 +02:00
Xinchen Hui
0981345734 Merge branch 'PHP-5.6' 2015-04-12 12:12:38 +08:00
Xinchen Hui
dd50ec1538 Remove failing test 
<nikic> [19:57:28] debian has a libmcrypt patch that makes it work
<nikic> [19:57:43] but not all other distros have it
 2015-04-12 12:12:16 +08:00
Anatol Belski
2d78023244 cleanup the mod version macros, round 2 2015-03-23 20:33:54 +01:00
Nikita Popov
7810659cc3 Removed deprecated mcrypt_ecb() etc 2015-03-09 11:37:13 +01:00
Nikita Popov
c488a45701 Remove deprecated mcrypt_generic_end() alias 2015-03-09 11:10:52 +01:00
Xinchen Hui
2517b56cd1 Ported mcrypt 2015-02-03 11:58:11 +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
Dmitry Stogov
70a2748b5e Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed possible read after end of buffer and use after free.
 2014-12-08 12:25:52 +03:00
Dmitry Stogov
278c38165c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed possible read after end of buffer and use after free.
 2014-12-08 12:24:16 +03:00
Dmitry Stogov
e6ad29ae96 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed possible read after end of buffer and use after free.
 2014-12-08 12:20:01 +03:00
Dmitry Stogov
dd791cd717 Fixed possible read after end of buffer and use after free. 2014-12-08 12:18:27 +03: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
Anatol Belski
a6ebaa142e fix datatype mismatch warnings 2014-10-31 19:36:18 +01:00
Anatol Belski
e3934515c4 fix datatype mismatch warnings 2014-10-31 19:36:17 +01:00
Anatol Belski
4b3e198023 removed *.dsw and *.dsp files 2014-09-28 19:02:09 +02:00
Nikita Popov
e33f3d3b7c Move smart_str implementation into Zend/ 
So we can use it there as well...

For now I've retained the zend_smart_str_public.h header, though
it would probably be better to just move that one struct into
zend_types.h.
 2014-09-21 20:49:39 +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
1e3e9e0bbb 's' and size_t - fix some invalid pointers and the remaining ext/mcrypt parts 2014-08-27 21:53:06 +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