php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-27 17:52:16 +01:00
Code Issues Packages Projects Releases Wiki Activity
93,712 Commits 547 Branches 1,481 Tags
56f1106162cdca2cdebfd9321545cc448da32d21
Commit Graph

4100 Commits

Author SHA1 Message Date
Reeze Xia
bdadec4581 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Unused value casting should be `void`
 2015-12-12 23:29:46 +08:00
Reeze Xia
95ad414658 Unused value casting should be void 2015-12-12 23:25:30 +08:00
Xinchen Hui
f43baba1f9 Fixed test by disable opcache 2015-12-10 21:46:37 +08:00
Xinchen Hui
e80791e161 Fixed test (opcache denpends) 2015-12-09 07:52:03 -08:00
George Wang
6d933b463e Bumped SAPI version to 6.9 2015-12-09 11:37:46 +01:00
George Wang
b3458eddfd Added "mod_auth_basic" to apache module list. 2015-12-09 11:37:45 +01:00
George Wang
5a319a02d8 Add sanitizing checks for request data. 2015-12-09 11:37:43 +01:00
George Wang
af1ac753fe Clear secret after use. 2015-12-09 11:37:42 +01:00
George Wang
42789e2b8a Fixed __DIR__ in CLI mode. 2015-12-09 11:37:40 +01:00
George Wang
13096a8120 Bumped SAPI version to 6.9 2015-12-09 00:19:18 -05:00
George Wang
9190684a76 Added "mod_auth_basic" to apache module list. 2015-12-09 00:16:16 -05:00
George Wang
59b414e128 Merge branch 'master' of git.php.net:php-src 2015-12-09 00:11:07 -05:00
George Wang
194cd13c2b Fixed __DIR__ in CLI mode. 2015-12-09 00:09:14 -05:00
George Wang
372a839040 Add sanitizing checks for request data. 2015-12-09 00:06:49 -05:00
George Wang
292aa9d6cb Clear secret after use. 2015-12-08 23:43:29 -05:00
Dmitry Stogov
404e003cf1 Delete empty live-ranges 2015-12-09 05:16:30 +03:00
Joe Watkins
03a43d50e1 standard tsrm usage for seven 2015-12-06 14:06:07 +01:00
Joe Watkins
ee704bff78 Merge branch 'master' of https://github.com/php/php-src 2015-12-06 10:04:59 +00:00
Joe Watkins
003c91bd9b standard tsrm usage for seven 2015-12-06 10:04:35 +00:00
Adam Harvey
612b9dc12e Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fix bug #71005 (Segfault in php_cli_server_dispatch_router()).
 2015-12-01 03:10:04 +00:00
Adam Harvey
91bad929aa Fix bug #71005 (Segfault in php_cli_server_dispatch_router()). 
We didn't initialise the retval variable in
php_cli_server_dispatch_router(); let's now initialise it to be
IS_UNDEF, as the following if condition expects.
 2015-12-01 03:09:36 +00:00
Lior Kaplan
c1b374554c Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #61751 (SAPI build problem on AIX: Undefined symbol: php_register_internal_extensions)
 2015-11-23 19:02:41 +02:00
Lior Kaplan
9642710a09 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fixed bug #61751 (SAPI build problem on AIX: Undefined symbol: php_register_internal_extensions)

 Conflicts:
	sapi/cgi/config9.m4
	sapi/fpm/config.m4
 2015-11-23 18:56:13 +02:00
Bob Weinand
9bbdb86ed7 Merge branch 'PHP-7.0' 2015-11-23 17:46:39 +01:00
Bob Weinand
c1189eccae Output stderr on real stderr in phpdbg 2015-11-23 17:46:07 +01:00
Lior Kaplan
d6b78a3511 Fixed bug #61751 (SAPI build problem on AIX: Undefined symbol: php_register_internal_extensions) 2015-11-23 18:40:47 +02:00
Xinchen Hui
58168b48e2 Fixed tests (new opcache will optimize serias echo IS_CONST into one) 2015-11-22 06:49:28 -08:00
George Wang
5bcb7a7019 Fixed runtime php.ini override, ini name length is off by 1. 2015-11-19 17:01:26 -05:00
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
c856b6e0ff Update mime type generator script to keep track of additional mime-types 2015-11-15 20:25:47 +08:00
Thorsten Rinne
04c3fbac37 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-15 20:25:39 +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
f72c7edfa4 Ensure the test fails 2015-11-11 14:55:33 +01: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