mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 18:34:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
90,088 Commits 500 Branches 1,381 Tags 797 MiB
e97d5fab35
Commit Graph

3826 Commits

Author SHA1 Message Date
Xinchen Hui
8aa76a5bdd Fixed test 2015-03-21 17:50:50 +08:00
Xinchen Hui
c524dd6d1e Merge branch 'rfc-preg-replace-callback-array' of https://github.com/zxcvdavid/php-src 
Conflicts:
	Zend/zend_vm_gen.php
	ext/pcre/php_pcre.c
 2015-03-21 14:01:11 +08:00
Anatol Belski
49fdb8a91d fix include 2015-03-19 22:33:14 +01:00
Anatol Belski
d3ab945d9c using zend_stat_t 2015-03-19 22:33:13 +01:00
Havard Eidnes
36e251ade3 Treat NetBSD the same as FreeBSD wrt. TCP_INFO usage. 2015-03-19 09:39:54 +01:00
Anatol Belski
eb5dfedb6b don't expect set/get title symbols are always there 2015-03-18 20:50:54 +01:00
Nikita Popov
e39db5773d Fix phpdbg 2015-03-17 22:59:11 +01:00
Xinchen Hui
50e4033475 Let phpdbg refused to be compiled with no CALL zend vm kind 2015-03-16 17:10:26 +08:00
Lior Kaplan
d79fe57216 Fix copyright years 2015-03-13 11:27:40 +02:00
Lior Kaplan
a4384bd3d4 s/PHP Version 5/PHP Version 7/g 
Follow up for d0cb7153
 2015-03-13 11:09:42 +02:00
Dmitry Stogov
ae26a51f0f Added API function to call VM opcode handler in a portable way 2015-03-13 11:29:43 +03:00
Wei Dai
25566c67fe Implement preg_replace_callback_array function 2015-03-13 11:52:36 +08:00
Xinchen Hui
f678c14a6c Merge branch 'fixed-build' of https://github.com/zxcvdavid/php-src 2015-03-10 10:31:36 +08:00
Wei Dai
3f3e34040a Fixed compile warnings 2015-03-09 21:25:43 +08:00
Nikita Popov
b0055678bf Fix CLI test and drop some now unnecessary code 2015-03-09 14:09:34 +01:00
Dmitry Stogov
1c94ff0595 Implement engine exceptions 
RFC: https://wiki.php.net/rfc/engine_exceptions_for_php7

Pending changes regarding naming of BaseException and whether it
should be an interface.
 2015-03-09 14:01:32 +01:00
Reeze Xia
2a2c74997d Now opened_path is a zend_string 2015-03-09 16:12:53 +08:00
Xinchen Hui
96f7a33df6 Temorary fix for phpdbg segfault while use zend_mm_set_custom_handlers 2015-03-09 11:19:05 +08:00
xingxing
1b0d32b350 Add configtest option to fpm init.d script 2015-03-08 22:48:29 +08:00
Xinchen Hui
fd5a756ad4 Revive Zend Signals handler (and fixed bug #61083) 2015-03-05 18:11:22 +08:00
Reeze Xia
c6e415aeb2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #67741 (auto_prepend_file messes up __LINE__)

Conflicts:
	main/main.c
 2015-03-03 11:44:52 +08:00
Reeze Xia
4e2c87edb3 Fixed bug #67741 (auto_prepend_file messes up __LINE__) 
This also fixes bug #54081
 2015-03-03 11:43:23 +08:00
Reeze Xia
34f09b6240 Fixed bug #67741 (auto_prepend_file messes up __LINE__) 
This also fixes bug #54081
 2015-03-03 11:25:30 +08:00
George Wang
bb491c2de1 Fixed a bug that header value is not terminated by '\0' when accessed through getenv(). 
Conflicts:
	sapi/litespeed/lsapilib.c
 2015-02-25 11:30:33 -05:00
George Wang
65810bf259 Fixed a bug that header value is not terminated by '\0' when accessed through getenv(). 2015-02-25 11:24:19 -05:00
George Wang
f13a88ac13 Fixed a bug that header value is not terminated by '\0' when accessed through getenv(). 2015-02-25 11:23:36 -05:00
George Wang
8584cc010a Fixed a bug that header value is not terminated by '\0' when accessed through getenv(). 2015-02-25 10:48:19 -05:00
Dmitry Stogov
c2c78dc963 Added specialized versions of DO_FCALL handler: 
DO_ICALL - for internal functions
  DO_UCALL - for user functions
  DO_FCALL_BY_NAME - plain, most probably user, funcstions (not methods)
 2015-02-25 10:37:21 +03: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
a80ad10d9b - Fix merge 2015-02-16 12:21:20 -02:00
Antony Dovgal
1d94cd4bfa Merge branch 'pull-request/995' into PHP-5.5 
* pull-request/995:
  fix bug #68822 (request time is reset too early)
 2015-02-16 15:20:39 +03:00
Antony Dovgal
c4664d1731 Merge branch 'pull-request/995' into PHP-5.6 
* pull-request/995:
  fix bug #68822 (request time is reset too early)
 2015-02-16 15:15:11 +03:00
redfoxli
3664345aba fix bug #68822 (request time is reset too early) 
this caused wrong time in the logs
 2015-02-16 15:10:09 +03: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
Anatol Belski
5d8ebcc73c remove useless condition (same as headers_list()) 2015-02-13 11:21:49 +01:00
Reeze Xia
bb20917049 Silence unused variable warning 2015-02-13 10:13:19 +00:00
Reeze Xia
46d9572945 Fixed phpdbg zend_bailout error when compiling syntax error code 
@krakjoe if there is something wrong, tell me plz
 2015-02-13 17:47:47 +08:00
Xinchen Hui
3224459232 Merge branch 'master' of https://git.php.net/repository/php-src 2015-02-13 14:29:27 +08:00
Reeze Xia
39203441ed Fixed phpdbg backtrace argument's name missing 2015-02-13 06:22:04 +00: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
5e7fd50376 Remove useless TSRMLS by merge 2015-02-13 11:02:37 +08:00
Xinchen Hui
309e90638d Cleanup globals initialization 2015-02-13 10:58:35 +08:00
Anatol Belski
61d85cedd5 fix values for gid and uid 
As stated by MSDN, these fields are always set to zero
 2015-02-11 11:46:31 +01:00
Anatol Belski
e6bf9b45dd silence unused variable warning 2015-02-11 11:46:30 +01:00
Anatol Belski
12a42433b2 remove useless condition 2015-02-11 11:46:29 +01:00
Reeze Xia
6c9d75b44d Add missing header inclusion 2015-02-10 22:30:54 +08:00
Dmitry Stogov
1eb4352143 Use new ZEND_HASH_FOREACH_... API. 2015-02-10 15:43:12 +03:00
Anatol Belski
575199a754 removed sapi/webjames 2015-02-10 08:41:22 +01:00
Anatol Belski
f5c796cee4 removed sapi/tux 2015-02-10 08:40:59 +01:00
Anatol Belski
3ef7136cae removed sapi/thttpd 2015-02-10 08:40:34 +01:00
Anatol Belski
15ab00ddf6 removed sapi/roxed 2015-02-10 08:40:13 +01:00
Anatol Belski
49fc89d1cb removed sapi/pi3web 2015-02-10 08:39:31 +01:00
Anatol Belski
6482e90970 removed sapi/phttpd 2015-02-10 08:38:47 +01:00
Anatol Belski
e6f62c50cc removed sapi/milter 2015-02-10 08:38:21 +01:00
Anatol Belski
4fedc42c2b removed sapi/isapi 2015-02-10 08:37:44 +01:00
Anatol Belski
591f16f392 removed sapi/continuity 2015-02-10 08:37:14 +01:00
Anatol Belski
6d7d1a1bde removed sapi/caudium 2015-02-10 08:36:43 +01:00
Anatol Belski
fd9c95bac5 removed sapi/apache2filter 2015-02-10 08:36:12 +01:00
Anatol Belski
53349d69dd removed sapi/apache_hooks 2015-02-10 08:35:36 +01:00
Anatol Belski
51ca2dba53 removed sapi/apache 2015-02-10 08:34:56 +01:00
Anatol Belski
4949fa55ab removed sapi/aolserver 2015-02-10 08:33:34 +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
George Wang
c90cd09331 Fixed #68790 (Missing return) 2015-02-07 12:19:53 -05:00
George Wang
c892127f76 Fixed #68790 (Missing return) 2015-02-07 12:18:42 -05:00
George Wang
5e3f0f5671 Fixed #68790 (Missing return) 2015-02-07 12:16:54 -05:00
Stanislav Malyshev
c440043de5 Merge branch 'pull-request/884' 
* pull-request/884:
  Fix #66479: Wrong response to FCGI_GET_VALUES
 2015-02-01 00:36:53 -08:00
Stanislav Malyshev
ac3a4e4200 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix #66479: Wrong response to FCGI_GET_VALUES
 2015-02-01 00:36:21 -08:00
Frank Stolle
6a905a9a3c Fix #66479: Wrong response to FCGI_GET_VALUES 
Requesting Get-Values via FCGI caused an "endless" loop over the last requested parameter and ended with an invalid response. this patch solves this loop bug.

Conflicts:
	sapi/cgi/fastcgi.c
 2015-02-01 00:35:23 -08:00
Stanislav Malyshev
62d6f91b3e Merge branch 'pull-request/1011' 
* pull-request/1011:
  Fix for a previous commit. i read it as size_t, notssize_t.
  Remove useless tests
 2015-02-01 00:21:47 -08:00
Joshua Rogers
d492bc8b6b Fix for a previous commit. i read it as size_t, notssize_t. 2015-02-01 19:02:25 +11:00
Stanislav Malyshev
141b14454c Merge branch 'PHP-5.6' 
* PHP-5.6:
  Use better constant since MAXHOSTNAMELEN may mean shorter name
  use right sizeof for memset

Conflicts:
	ext/sockets/sockaddr_conv.c
	ext/standard/dns.c
 2015-01-31 21:50:08 -08:00
Stanislav Malyshev
6a960b6d1b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Use better constant since MAXHOSTNAMELEN may mean shorter name
  use right sizeof for memset
 2015-01-31 21:48:40 -08:00
Stanislav Malyshev
af1f867308 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Use better constant since MAXHOSTNAMELEN may mean shorter name
  use right sizeof for memset
 2015-01-31 21:48:14 -08:00
Stanislav Malyshev
b30a6d6018 Use better constant since MAXHOSTNAMELEN may mean shorter name 2015-01-31 21:46:56 -08:00
Stanislav Malyshev
2cdbd3537f use right sizeof for memset 2015-01-31 21:30:58 -08:00
Stanislav Malyshev
41bdd6e7cc Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Add mitigation for CVE-2015-0235 (bug #68925)
  Add mitigation for CVE-2015-0235 (bug #68925)
 2015-01-31 19:12:20 -08:00
Stanislav Malyshev
237128603f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Add mitigation for CVE-2015-0235 (bug #68925)
 2015-01-31 19:08:37 -08:00
Stanislav Malyshev
0f9c708229 Add mitigation for CVE-2015-0235 (bug #68925) 2015-01-31 19:08:13 -08:00
Stanislav Malyshev
457367e0b6 Add mitigation for CVE-2015-0235 (bug #68925) 2015-01-31 19:04:55 -08:00
Michael Wallner
130d7320b1 Merge branch 'incorrect_close' of github.com:MegaManSec/php-src 
* 'incorrect_close' of github.com:MegaManSec/php-src:
  Use correct deallocator in phpdbg
 2015-01-30 23:11:33 +01:00
Michael Wallner
c0477fbcb5 Squashed commit of the following: 
commit 5cee14b14b
Merge: 6392e1e 59593ba
Author: Shafreeck Sea <renenglish@gmail.com>
Date:   Tue Jan 27 19:15:48 2015 +0800

    Merge branch 'master' of git://github.com/php/php-src

commit 6392e1e86a
Author: Shafreeck Sea <renenglish@gmail.com>
Date:   Tue Jan 27 11:32:04 2015 +0800

    Remove duplicated line
 2015-01-30 23:01:26 +01:00
Anatol Belski
563e7822fd fix datatype mismatches, improve error checks 2015-01-30 16:31:19 +01:00
Xinchen Hui
88e13bda6a Fixed bug #68945 (Unknown admin values segfault pools) 2015-01-30 11:01:42 +08:00
Xinchen Hui
95142d9015 Merge branch 'PHP-5.6' 2015-01-27 22:25:55 +08:00
Xinchen Hui
b881de9937 Merge branch 'PHP-5.5' into PHP-5.6 2015-01-27 22:25:45 +08:00
Xinchen Hui
4c5995b172 fcgi_write in fpm returns ssizt_t, but it returns int in cgi 2015-01-27 22:25:38 +08:00
Xinchen Hui
737b6f69e3 Merge branch 'PHP-5.6' 2015-01-27 22:20:17 +08:00
Xinchen Hui
92d56b0af6 Merge branch 'PHP-5.5' into PHP-5.6 2015-01-27 22:20:03 +08:00
Xinchen Hui
c3ff9aa17d Revert previous unintentional change to this 2015-01-27 22:19:11 +08:00
Xinchen Hui
9fdf62d64a Merge branch 'PHP-5.6' 
Conflicts:
	sapi/cgi/cgi_main.c
 2015-01-27 22:15:12 +08:00
Xinchen Hui
6336fa18c4 Merge branch 'PHP-5.5' into PHP-5.6 2015-01-27 22:13:04 +08:00
Xinchen Hui
8c2d91761a Also Fixed #68571 in CGI SAPI, and some cleanup 2015-01-27 22:11:23 +08:00
Xinchen Hui
6c87372199 Merge branch 'fixbug68571tophp5.5' of https://github.com/redfoxli/php-src into PHP-5.5 2015-01-27 22:04:23 +08:00
Joshua Rogers
305c03e757 Use correct deallocator in phpdbg 2015-01-27 09:28:54 +11:00
Nikita Popov
e05993dfa2 Remove dl() on fpm-fcgi 2015-01-26 21:00:23 +01:00
Dmitry Stogov
3e31838d19 zend_read_property() has to provide a holder for return value. 
Previously it was possible that zend_read_property() returned pointer to zval allocated on stack.
 2015-01-22 11:50:42 +03:00
Rasmus Lerdorf
e242f871df Slightly modify and merge PR#105 from @MegaManSec 2015-01-21 11:40:27 -08:00
Rasmus Lerdorf
295926855b Slightly modify and merge PR#105 from @MegaManSec 2015-01-21 11:39:23 -08:00
Joshua Rogers
eba0e0348e Remove useless tests 
Respective variables are unsigned and cannot be <0.
 2015-01-21 05:23:28 +11:00
Xinchen Hui
1b53a99fbf Remove dead codes 2015-01-19 10:46:59 -05:00