clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-26 20:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
80,390 Commits 494 Branches 1,367 Tags 881 MiB
9d047bb138
Commit Graph

3187 Commits

Author SHA1 Message Date
Lior Kaplan
9d047bb138 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
 2014-06-18 00:21:20 +03:00
Lior Kaplan
b0b47a2064 Update copyright year to 2014 2014-06-18 00:18:47 +03:00
Lior Kaplan
1222f51ebd Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
 2014-06-18 00:14:18 +03:00
Lior Kaplan
d2bdedbcfc Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Update copyright year to 2014
  Update copyright year to 2014
 2014-06-18 00:11:35 +03:00
Lior Kaplan
945938d33c Update copyright year to 2014 2014-06-17 23:56:46 +03:00
Lior Kaplan
6e0a9b4588 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Update copyright year to 2014
  Update copyright year for re2c generated files
  Update copyright year to 2014
  Update copyright year for re2c files as well
 2014-06-16 23:36:39 +03:00
Lior Kaplan
b538816b0b Update copyright year to 2014 2014-06-16 23:34:50 +03:00
Bob Weinand
1d71600394 Merge branch 'PHP-5.6' 2014-06-15 15:47:44 +02:00
Bob Weinand
f677889a9a Merge sapi/phpdbg into PHP-5.6 2014-06-15 15:47:14 +02:00
Adam Harvey
dd57ceb1de Merge branch 'PHP-5.6' 
* PHP-5.6:
  Add 308 and 426 to the HTTP response code map in the CLI server.
 2014-06-12 17:57:55 -07:00
Adam Harvey
e082199d8e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Add 308 and 426 to the HTTP response code map in the CLI server.
 2014-06-12 17:57:36 -07:00
Adam Harvey
e956ba9357 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Add 308 and 426 to the HTTP response code map in the CLI server.
 2014-06-12 17:56:10 -07:00
Adam Harvey
fe67674809 Add 308 and 426 to the HTTP response code map in the CLI server. 
Implements FR #67429 (CLI server is missing some new HTTP response codes).
 2014-06-12 17:54:29 -07:00
Adam Harvey
f79f3ac184 Fix broken test. 2014-06-11 00:22:13 +00:00
Adam Harvey
c12f832479 Add a mime type map generation script and update the header. 2014-06-11 00:19:49 +00:00
Adam Harvey
8c59ae345e Move the mime type map out of php_cli_server.c for easier generation. 2014-06-11 00:18:33 +00:00
Adam Harvey
faa34f24e3 Replace the CLI server's linear search for extensions with a hash table. 
This doesn't make a statistically significant performance impact either way
today, but gives us more scope to grow the MIME type list.
 2014-06-10 23:57:42 +00:00
Remi Collet
39885d0819 Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  NEWS
  Fixed bug #67406 built-in web-server segfaults on startup
 2014-06-10 10:39:10 +02:00
Remi Collet
e2493a3a08 fix merge from php 5.5 (already fixed, differently) 2014-06-10 10:38:39 +02:00
Remi Collet
d440bb3e68 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Fixed bug #67406 built-in web-server segfaults on startup
 2014-06-10 10:32:26 +02:00
Remi Collet
58c6a08e00 Fixed bug #67406 built-in web-server segfaults on startup 
Reproduce on aarch64.

From select man page:
  "select() may update the timeout argument to indicate how much time was left."
So "const" is not ok.
 2014-06-10 10:28:34 +02:00
Bob Weinand
f0a9905759 Merge branch 'PHP-5.6' 2014-06-09 10:07:36 +02:00
Bob Weinand
6adc30028c Merge sapi/phpdbg into PHP-5.6 2014-06-09 10:06:29 +02:00
Bob Weinand
1e85b9e86b Merge branch 'PHP-5.6' 
Conflicts:
	sapi/phpdbg/phpdbg.c
 2014-06-04 02:20:35 +02:00
Bob Weinand
848df6fcbe Merge sapi/phpdbg into PHP-5.6 2014-06-04 02:18:39 +02:00
Bob Weinand
a1b0ae4247 Fixed startup segfault in non-debug builds 
Fixes issue #87
 2014-06-03 21:24:55 +00:00
Bob Weinand
241211975e PHP 5.4/5.5 compability in phpdbg_watch.c 2014-06-03 21:24:45 +00:00
Bob Weinand
466cd2aa7d Merge sapi/phpdbg into PHP-5.6 2014-06-03 21:15:02 +00:00
Bob Weinand
f66449a467 Merge branch 'PHP-5.6' 2014-05-03 11:41:33 +02:00
Bob Weinand
003ba74d99 Merge sapi/phpdbg into PHP-5.6 2014-05-03 11:40:25 +02:00
Bob Weinand
3ad8616aff Added stdion/stdout/stderr constsnts and their php:// wrappers 
Fixes issue #85
 2014-05-01 11:43:46 +02:00
Bob Weinand
191e3a0210 Merge sapi/phpdbg 2014-05-01 11:41:49 +02:00
Stanislav Malyshev
f2a3be9627 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug #67060: use default mode of 660
 2014-04-29 09:17:10 -07:00
Stanislav Malyshev
c397fcc35f Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #67060: use default mode of 660
 2014-04-29 09:16:24 -07:00
Stanislav Malyshev
770fcdab90 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #67060: use default mode of 660
 2014-04-29 09:15:23 -07:00
Stanislav Malyshev
35ceea928b Fix bug #67060: use default mode of 660 2014-04-29 09:14:11 -07:00
Anatol Belski
705909aa48 Merge branch 'PHP-5.6' 
* PHP-5.6:
  C89 compat
 2014-04-27 18:02:07 +02:00
Anatol Belski
3b6bf6eec8 Merge remote-tracking branch 'phpdbg/master' into PHP-5.6 
* phpdbg/master:
  C89 compat
 2014-04-27 18:01:26 +02:00
Anatol Belski
5dbe7c98e4 Merge branch 'PHP-5.6' 
* PHP-5.6:
  removed /EHa as __try/__catch syntax is used anyway
  fix ZEND_DEBUG usage
  fix CFLAGS_PHPDBGS and some formatting
 2014-04-26 00:17:09 +02:00
Anatol Belski
a10dc3aa4f Merge remote-tracking branch 'phpdbg/master' into PHP-5.6 
* phpdbg/master:
  removed /EHa as __try/__catch syntax is used anyway
  fix ZEND_DEBUG usage
  fix CFLAGS_PHPDBGS and some formatting
 2014-04-26 00:15:32 +02:00
Anatol Belski
ceec2152a6 Merge branch 'PHP-5.6' 
* PHP-5.6:
  use a portable strndup implementation
  fixed C89 compat
  prepare config.w32
  add parser files to dist
 2014-04-24 11:07:08 +02:00
Anatol Belski
cd2641973c Merge remote-tracking branch 'phpdbg/master' into PHP-5.6 2014-04-24 11:05:52 +02:00
Felipe Pena
fd96831f68 Merge branch 'PHP-5.6' 
* PHP-5.6:
  sapi/litespeed/lsapi_main.c: Fix bug #63228
 2014-04-22 10:49:18 -03:00
George Wang
742f4704a9 sapi/litespeed/lsapi_main.c: Fix bug #63228 
Fix compiling error at line 606 (error: format not a string
literal and no format arguments [-Werror=format-security]
 2014-04-22 10:48:14 -03:00
Bob Weinand
823ddab3f3 Merge branch 'PHP-5.6' 2014-04-21 23:32:57 +02:00
Bob Weinand
708af5fd8e Merge sapi/phpdbg into PHP-5.6 2014-04-21 23:30:08 +02:00
Stanislav Malyshev
185e5c0327 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix #66908: php-fpm reload leaks epoll_create() file descriptor
 2014-04-20 16:25:25 -07:00
Stanislav Malyshev
0df431482f Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix #66908: php-fpm reload leaks epoll_create() file descriptor
 2014-04-20 16:25:03 -07:00
Stanislav Malyshev
6bad228b4e Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix #66908: php-fpm reload leaks epoll_create() file descriptor
 2014-04-20 16:23:43 -07:00
Julio Pintos
49341e992a Fix #66908: php-fpm reload leaks epoll_create() file descriptor 
This patch fixes descriptor leak which could lead to DoS once Max open files is reached
 2014-04-20 16:21:49 -07:00