php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-31 04:32:19 +02:00
Code Issues Packages Projects Releases Wiki Activity
93,292 Commits 547 Branches 1,481 Tags
03d5fdc1b88f4e2f12d28ae55a80ac7800a55cb4
Commit Graph

4067 Commits

Author SHA1 Message Date
Xinchen Hui
ae196280bb Revert pushed by mistake 
Revert "Revert "Remove assumption that extensions are in ext/ext-name""

This reverts commit 7e47bf1e65.
 2015-11-16 18:04:29 +08:00
Xinchen Hui
48325aba87 Merge branch 'master' of git.php.net:/php-src 2015-11-16 17:02:55 +08:00
Reeze Xia
8222b971cd Update mime type generator script to keep track of additional mime-types 2015-11-15 11:08:14 +08:00
Xinchen Hui
90027dd7f6 Merge branch 'master' of https://github.com/thorsten/php-src 2015-11-14 01:56:46 -08:00
Xinchen Hui
7e47bf1e65 Revert "Remove assumption that extensions are in ext/ext-name" 
This reverts commit 82b73fd1e3.

Conflicts:

	build/genif.sh
	build/order_by_dep.awk
 2015-11-13 14:27:59 +08:00
Xinchen Hui
9567726978 Merge branch 'PHP-7.0' 2015-11-11 19:51:57 +08:00
Xinchen Hui
88fb6d90c4 Ensure the test fails 2015-11-11 19:51:33 +08:00
Thorsten Rinne
a0d62f08ae Added support for CSS/JavaScript source maps 
Source maps (http://www.html5rocks.com/en/tutorials/developertools/sourcemaps/) are basically a way to map a combined/minified file back to an unbuilt state. To avoid error messages in Browser DevTools, source map files should be served with the MIME type "application/json"
 2015-11-11 08:34:36 +01:00
Dmitry Stogov
86a96f2cf1 Changed meaning of "op2" for ZEND_FREE, ZEND_FE_FREE, ZEND_FAST_CALL, ZEND_FAST_RET. 
Previously it was an instruction number.
Now it's an index in op_array->try_cacth_array[].
 2015-11-10 19:13:54 +03:00
Lynn
269674f79d rm duplicate include 2015-11-07 23:01:23 -08:00
Xinchen Hui
948bb4d224 Merge branch 'c9n-patch-1' of https://github.com/c9n/php-src 2015-11-07 23:01:09 -08:00
Anatol Belski
655e266440 Merge branch 'PHP-7.0' 
* PHP-7.0:
  update NEWS
  fix decrement_function regarding bug #70863
  Fixed bug #70863 Incorect logic to increment_function for proxy objects
  no more dev ZEND_VERSION
  Add support for IPV6_V6ONLY on sockets

Conflicts:
	Zend/zend.h
 2015-11-06 23:10:40 +01:00
Anatol Belski
8155ecba61 Fixed bug #70863 Incorect logic to increment_function for proxy objects 2015-11-06 23:07:16 +01:00
Xinchen Hui
a79a504b6d Merge branch 'PHP-7.0' 2015-11-02 16:43:52 +08:00
Xinchen Hui
d7ff107654 Fixed bug #70540 (sapi/fpm/tests/008.phpt and 016.phpt should be skipped on some platforms) 2015-11-02 16:43:28 +08:00
Xinchen Hui
8dd5e1c2b5 Add test_fpm_conf to skip some tests ranth than mark --xfail-- 2015-11-02 16:42:11 +08:00
Lynn
a4d5accf7d rm duplicate include 2015-10-28 11:21:15 +08:00
Dmitry Stogov
648347536a Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed incomplete initialization.
 2015-10-30 07:16:31 +03:00
Dmitry Stogov
3c5a3e77d4 Fixed incomplete initialization. 2015-10-30 07:15:56 +03:00
Nuno Lopes
a0665f3a18 unbreak coverage data: fix #line directives in phpdbg parser 2015-10-24 17:45:53 -04:00
Nuno Lopes
b5206970fb unbreak coverage data: fix #line directives in phpdbg parser 2015-10-24 17:45:31 -04:00
ngsw
90d1e9d178 Fix: fold-maker `fpm_event_pre_init()' 2015-10-22 23:21:46 +09:00
Bob Weinand
387b7c7905 Merge branch 'PHP-7.0' 2015-10-20 21:56:20 +02:00
Bob Weinand
2ef327caed Exempt paging from -qrr mode 2015-10-20 21:56:00 +02:00
Felipe Pena
b2466061d5 Merge branch 'PHP-7.0' 2015-10-18 12:10:03 -02:00
Felipe Pena
f231ddddaf - Implemented output paging 2015-10-18 12:08:04 -02:00
Bob Weinand
bcf6012cf4 Merge branch 'PHP-7.0' 2015-10-13 15:51:42 +02:00
Bob Weinand
d398cc9d10 Prevent memcmp() result truncation 
This fixes reported issues with sapi/phpdbg/tests/watch_001.phpt
 2015-10-13 15:51:23 +02:00
Bob Weinand
6efbfc4caf phpdbg test info_001.phpt was dependent on auto_globals_jit 2015-10-13 14:40:42 +02:00
Bob Weinand
c717d14a8e Merge branch 'PHP-7.0' 2015-10-13 11:30:14 +02:00
Bob Weinand
e85a0aba9b Fix on/off values in phpdbg lexer 2015-10-13 11:29:51 +02:00
Felipe Pena
ffebd5dbf6 - Fixed missing line-break 2015-10-12 09:54:03 -03:00
Bob Weinand
8285731362 Fix parse errors in -rr mode 2015-10-02 12:51:32 +02:00
Bob Weinand
4f90e2ec9d Ensure proper set_exception_handler() handling with exit() inside it 2015-10-02 12:37:40 +02:00
Bob Weinand
0c03ba0ad0 Fixed bug #70614 (incorrect exit code in -rr mode with Exceptions) 2015-10-02 12:37:40 +02:00
Bob Weinand
32337d35cc Do not display memory leaks on fatal 2015-10-02 12:37:40 +02:00
Bob Weinand
6c61286da4 Do not include zend_verify_return_type in executable ops (phpdbg) 2015-10-02 12:37:39 +02:00
Nikita Popov
1287c48082 Fix/improve zpp usage 
The ext/interbase changes are done blindly, fingers crossed.

Some of these are bug fixes, some make zpp usage more idiomatic.
 2015-10-02 09:35:00 +02:00
Bob Weinand
ba6d193b4c Add NTS/ZTS information to php -v 2015-09-30 12:39:09 +02:00
Anatol Belski
59541795e2 fork test 2015-09-30 11:13:29 +02:00
Anatol Belski
e80306cbe8 fix tests on Windows 2015-09-30 11:13:28 +02:00
Anatol Belski
353d996c9f tweak cgi binary search 2015-09-30 11:13:27 +02:00
Anatol Belski
c82e21619e fix phpdbg's -h switch 
The help functionality needs a correct stdout fd, so pre setup it
for the only case.
 2015-09-27 15:46:07 +02:00
Bob Weinand
bccac3774b Fixed bug #70531 (-rr should not fallback to interactive mode in phpdbg) 2015-09-23 18:30:13 +02:00
Bob Weinand
4a174ca7e6 Fixed bug #70532 (respect set_exception_handler in phpdbg) 2015-09-23 17:53:29 +02:00
Xinchen Hui
c256649d63 Fixed memleaks in apache2handler 2015-09-23 07:08:51 -07:00
Dmitry Stogov
01ed736827 Don't keep dangling pointers 2015-09-23 16:16:04 +03:00
Xinchen Hui
1d6228b46a Fixed bug #70279 (HTTP Authorization Header is sometimes passed to newer reqeusts) 2015-09-22 15:28:53 +08:00
Xinchen Hui
85eece9c4f Fixed bug #70538 ("php-fpm -i" crashes) 2015-09-21 11:18:37 +08:00
Xinchen Hui
a247c3a27d Fixed bug #70538 ("php-fpm -i" crashes) 2015-09-21 10:55:38 +08:00