bdnugget/php-src
1
0 Fork 0
mirror of https://github.com/bdnugget/php-src.git synced 2026-11-13 12:10:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
80,585 Commits 375 Branches 1,117 Tags
99b95f3eb256ffeebdac052d21bb9b2bdf69d081
Commit Graph
3209 Commits
Author SHA1 Message Date
Ferenc Kovacs 2d26a7cf62 Merge branch 'PHP-5.6' 
* PHP-5.6:
  remove the NEWS entry for the reverted fpm fix
  remove the NEWS entry for the reverted fpm fix
  remove the NEWS entry for the reverted fpm fix
  Revert "Fix Bug #67530 	error_log=syslog ignored"
 2014-06-30 18:39:31 +02:00
Ferenc Kovacs d810c2139f Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  remove the NEWS entry for the reverted fpm fix
  remove the NEWS entry for the reverted fpm fix
  Revert "Fix Bug #67530 	error_log=syslog ignored"
 2014-06-30 18:38:54 +02:00
Ferenc Kovacs af9ce6e650 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  remove the NEWS entry for the reverted fpm fix
  Revert "Fix Bug #67530 	error_log=syslog ignored"
 2014-06-30 18:38:15 +02:00
Ferenc Kovacs 9c8b42960d Revert "Fix Bug #67530 error_log=syslog ignored" 
This reverts commit a0ecb3794f.
 2014-06-30 18:37:23 +02:00
Ferenc Kovacs c73e1f80f5 Merge branch 'PHP-5.6' 
* PHP-5.6:
  adding NEWS entry for the fix for bug #65641
  Fix SetHandler proxy:fcgi:// incompatibilities
 2014-06-30 01:03:29 +02:00
Ferenc Kovacs d96de86b5b Merge branch 'pull-request/694' into PHP-5.6 
* pull-request/694:
  Fix SetHandler proxy:fcgi:// incompatibilities
 2014-06-30 00:51:59 +02:00
Bob Weinand ee6bab61eb Merge branch 'PHP-5.6' 2014-06-29 13:01:11 +02:00
Bob Weinand 1dd3bab1df Merge sapi/phpdbg into PHP-5.6 2014-06-29 12:49:10 +02:00
Remi Collet 6fa814cfc3 Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  NEWS
  NEWS
  Fix Bug #67531 	syslog cannot be set in pool configuration
  Fix Bug #67530 	error_log=syslog ignored
 2014-06-27 09:51:52 +02:00
Remi Collet 37aa57cd1b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  NEWS
  Fix Bug #67531 	syslog cannot be set in pool configuration
  Fix Bug #67530 	error_log=syslog ignored
 2014-06-27 09:51:15 +02:00
Remi Collet 13c5bb9600 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Fix Bug #67531 	syslog cannot be set in pool configuration
  Fix Bug #67530 	error_log=syslog ignored
 2014-06-27 09:50:27 +02:00
Remi Collet bf328b1681 Fix Bug #67531 syslog cannot be set in pool configuration 
error_log is listed in FPM_PHP_INI_TO_EXPAND,
but should not be expand when value = syslog
 2014-06-27 09:47:28 +02:00
Remi Collet a0ecb3794f Fix Bug #67530 error_log=syslog ignored 
As for Bug #64915
Systemd use --nodaemonize but need to error_log to file or syslog to be honoured
 2014-06-27 09:45:53 +02:00
Bob Weinand 0b06c8f82b Merge branch 'PHP-5.6' 2014-06-25 13:57:19 +02:00
Bob Weinand 09b2510df6 Merge sapi/phpdbg into PHP-5.6 2014-06-25 13:56:45 +02:00
Remi Collet 0da5d94a6c Better fix for phpdbg + libedit 
- fix include
- disable coloured prompt only with libedit
 2014-06-23 10:21:19 +02:00
Remi Collet 0febafcfbe Fix https://github.com/krakjoe/phpdbg/issues/91 
Enable edit feature when build with libedit.

Notice: coloured prompt only enable with READLINE
 2014-06-23 10:21:19 +02:00
Remi Collet a52b927bf3 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Better fix for phpdbg + libedit - fix include - disable coloured prompt only with libedit
  Fix https://github.com/krakjoe/phpdbg/issues/91
 2014-06-23 10:18:55 +02:00
Remi Collet 98d41dfc9d Better fix for phpdbg + libedit 
- fix include
- disable coloured prompt only with libedit
 2014-06-23 10:17:43 +02:00
Remi Collet 86bafec836 Fix https://github.com/krakjoe/phpdbg/issues/91 
Enable edit feature when build with libedit.

Notice: coloured prompt only enable with READLINE
 2014-06-23 10:04:40 +02:00
Lior Kaplan eba7c77685 Update copyright year to 2014 2014-06-18 00:22:16 +03:00
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
David Zülke db537b1f3f Fix SetHandler proxy:fcgi:// incompatibilities 
Apache 2.4.10+ will allow the following:

```
<FilesMatch \.php$>
SetHandler proxy:fcgi://localhost:9000
</FilesMatch>
```

This is much easier than using `ProxyPassMatch` (which prevents rewriting and other stuff) and rewrites (which are a bag of hurt because when combined with user-land `.htaccess` rewrites, there's always rewrite loops, prefix breakage etc (I've tried, for weeks).

It's basically the future of using Apache (via `mod_proxy_fcgi`) together with PHP-FPM. It's also available for older versions as a standalone module, very easy to install: https://gist.github.com/progandy/6ed4eeea60f6277c3e39

However, the two bits of code this commit deletes interfere with that. They both cover CGI-only mode and were copied from that SAPI into the FPM source. See e.g. https://bugs.php.net/bug.php?id=47042

The first deleted part mangled `SCRIPT_NAME` if something like

```
RewriteCond %{REQUEST_FILENAME} !-f
RewriteRule (.*) index.php/$1 [L]
```

is used (i.e. rewriting to `PATH_INFO`. The second part drops `PATH_INFO` if there was a `REDIRECT_URL` (with CGI mode, `SCRIPT_FILENAME` in Apache is the path to the PHP binary, and `PATH_INFO` contains the name of the script to run).

Clearly, neither applies in the case of FPM, so both are safe to delete.
 2014-06-12 21:45:22 +02: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