php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-21 15:08:16 +02:00
Code Issues Packages Projects Releases Wiki Activity
75,747 Commits 547 Branches 1,483 Tags
4883fc53653d6f36d5a0dfe045a4d29ef754d927
Commit Graph

362 Commits

Author SHA1 Message Date
Christopher Jones c6d977dd39 Fix long-standing visual pain point: the misalignment of './configure help' text. 
Whitespace changes and a couple of grammar fixes.
 2013-08-06 11:06:09 -07:00
Stanislav Malyshev c793a65690 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  non living code related typo fixes

Conflicts:
	Zend/zend_compile.c
 2013-08-04 16:06:24 -07:00
Veres Lajos 8d86597d73 non living code related typo fixes 2013-08-04 16:05:36 -07:00
Veres Lajos 4749457a49 HASH_KEY_NON_EXISTANT fix 2013-07-21 20:09:53 -07:00
Veres Lajos e9a95d78ef typo fixes 2013-07-15 00:23:03 -07:00
Veres Lajos 72085b0e5f typo fixes 2013-07-15 00:18:57 -07:00
Felipe Pena efbf573e9f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - BFN
  - Fixed bug #63983 (enabling FPM borks compile on FreeBSD) patch by: chibisuke at web dot de
 2013-06-26 15:08:51 -03:00
Felipe Pena cd176e0452 - Fixed bug #63983 (enabling FPM borks compile on FreeBSD) patch by: chibisuke at web dot de 2013-06-26 15:06:27 -03:00
Stanislav Malyshev a770ae36c2 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #64764: Add status option to fpm init.d script
 2013-06-16 16:56:29 -07:00
Lior Kaplan ee01af7df1 Fix bug #64764: Add status option to fpm init.d script 2013-06-16 16:54:49 -07:00
Stanislav Malyshev 02e4d7a290 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:30:59 -07:00
Stanislav Malyshev ac40c0b562 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:20:18 -07:00
Stanislav Malyshev 84e35fb2e0 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  typo fixes (argument)
  typo fixes (accommodate, parameter)
 2013-06-10 13:36:41 -07:00
Veres Lajos 04145dc2aa typo fixes (argument) 2013-06-10 13:36:17 -07:00
Remi Collet 433731d463 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed Bug #64915 (error_log ignored when daemonize=0)
 2013-05-24 12:10:39 +02:00
Remi Collet 9f6ca9bc64 Fixed Bug #64915 (error_log ignored when daemonize=0) 
Use configured error_log file when stderr is not a tty.
So only use tty during interactive debug run.
 2013-05-24 12:09:05 +02:00
Remi Collet c79f162c37 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Add --with-fpm-systemd option to report health to systemd, and systemd_interval option to configure this. The service can now use Type=notify in the systemd unit file.
 2013-05-21 09:53:51 +02:00
Remi Collet 0e99329e0a Add --with-fpm-systemd option to report health to systemd, and 
systemd_interval option to configure this. The service can now use
Type=notify in the systemd unit file.

Systemd status line will looks like:
Status: "Processes active: 0, idle: 5, Requests: 90, slow: 0, Traffic: 10req/sec"

Watchdog mode is also supported. In this case watchdog interval,
configured in the unit file, override the systemd_interval option.

When not used (default), no change from previous version.
 2013-05-21 09:49:00 +02:00
Remi Collet c9085837a9 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  From code coverity scan, syscall return value must be check.
 2013-05-03 08:23:07 +02:00
Remi Collet 3fd4b6be63 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  From code coverity scan, syscall return value must be check.
 2013-05-03 08:22:55 +02:00
Remi Collet 0549e55d82 From code coverity scan, syscall return value must be check. 
To not alter current behaviour, we simply log the problem,
so, if it occurs, the message will give explanation.

This are only warning as they don't block the server,
but such fail can explain strange (not expected) behaviour later.
 2013-05-03 08:19:14 +02:00
Remi Collet 6494faa844 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix more resource leaks
 2013-05-02 13:47:48 +02:00
Remi Collet b7b150b830 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  fix more resource leaks
 2013-05-02 13:47:36 +02:00
Remi Collet 444e59eb20 fix more resource leaks 2013-05-02 13:47:24 +02:00
Remi Collet a3e177b9fd Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  From code coverity scan - fix some memory leak - fix some resources leak (fd) - create fpm_worker_pool_free (shared use) - possible null dref (wp->user and wp->home can be null)
 2013-05-02 13:31:22 +02:00
Remi Collet 08b72ac9f1 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  From code coverity scan - fix some memory leak - fix some resources leak (fd) - create fpm_worker_pool_free (shared use) - possible null dref (wp->user and wp->home can be null)
 2013-05-02 13:31:11 +02:00
Remi Collet 331540d20c From code coverity scan 
- fix some memory leak
- fix some resources leak (fd)
- create fpm_worker_pool_free (shared use)
- possible null dref (wp->user and wp->home can be null)
 2013-05-02 13:27:16 +02:00
Remi Collet eb53035a80 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fixed size array cannot be null
 2013-05-02 10:33:05 +02:00
Remi Collet c374b80dda Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  fixed size array cannot be null
 2013-05-02 10:32:54 +02:00
Remi Collet d0c40220d1 fixed size array cannot be null 2013-05-02 10:32:45 +02:00
Remi Collet 2f12769db0 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  use limit_extensions as we use security_limit_extensions later (free)
  unused variable
 2013-05-02 10:15:49 +02:00
Remi Collet 78c48af2f2 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  use limit_extensions as we use security_limit_extensions later (free)
  unused variable
 2013-05-02 10:15:20 +02:00
Remi Collet 8492bbefbb use limit_extensions as we use security_limit_extensions later (free) 2013-05-02 10:15:12 +02:00
Remi Collet a7d6cb2360 unused variable 2013-05-02 10:15:05 +02:00
Remi Collet d42ae32738 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix possible null deref (detected by code coverity scan)
  Remove trailing space in NEWS
  NEWS for 514afd67
 2013-05-02 09:38:38 +02:00
Remi Collet be3f7ba4fb Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  fix possible null deref (detected by code coverity scan)
 2013-05-02 09:38:12 +02:00
Remi Collet ab117573cd fix possible null deref (detected by code coverity scan) 2013-05-02 09:38:00 +02:00
Remi Collet fbff4ccf27 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  When Apache use RewriteRule to redirect, via mod_proxy_fgi, to php-fpm the SCRIPT_FILENAME may contains the QUERY_STRING.
 2013-04-30 09:02:59 +02:00
Remi Collet 4a92ae3401 When Apache use RewriteRule to redirect, via mod_proxy_fgi, to php-fpm 
the SCRIPT_FILENAME may contains the QUERY_STRING.

Ex : RewriteRule ^(.*)\.php$ fcgi://127.0.0.1:9000/$1.php [P]

From apache debug (build with -DFCGI_DUMP_ENV_VARS)
AH01062: sending env var 'SCRIPT_FILENAME' value 'proxy:fcgi://127.0.0.1:9000/var/www/html/info.php?foo'
AH01071: Got error 'Primary script unknown\n'
 2013-04-30 08:55:18 +02:00
Stanislav Malyshev c877fcf6ec Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Added HTTP codes as of RFC 6585
 2013-02-17 01:20:14 -08:00
Jonh Wendell 59b016192d Added HTTP codes as of RFC 6585 
Added descriptions for the new HTTP codes:

- 428 Precondition Required
- 429 Too Many Requests
- 431 Request Header Fields Too Large
- 511 Network Authentication Required
 2013-02-17 01:18:40 -08:00
Adam Harvey 77010bf9bf Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Update the arguments in the prototype of fpm_socket_unix_test_connect().
 2013-01-16 10:19:13 +08:00
Adam Harvey 142c40f32c Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Update the arguments in the prototype of fpm_socket_unix_test_connect().
 2013-01-16 10:18:00 +08:00
Adam Harvey f63a9f6c11 Update the arguments in the prototype of fpm_socket_unix_test_connect(). 
Fixes bug #63999 (php with fpm fails to build on Solaris 10 or 11).
 2013-01-16 10:06:56 +08:00
Xinchen Hui a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Xinchen Hui 0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Xinchen Hui a2045ff332 Happy New Year~ 2013-01-01 16:02:16 +08:00
Remi Collet bc7f2b5f41 Merge branch 'PHP-5.3' into PHP-5.5 
* PHP-5.3:
  Fixed Bug #63581 Possible buffer overflow
  Fixed Bug #63581 Possible null dereference
 2012-11-28 10:38:37 +01:00
Remi Collet 487b7c7f32 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed Bug #63581 Possible buffer overflow
  Fixed Bug #63581 Possible null dereference
 2012-11-28 10:38:13 +01:00
Remi Collet bc492007da Fixed Bug #63581 Possible buffer overflow 
In fpm-log, possible buffer overflow. Check for length is done at
the beginning of the loop, so is not done when overflow occurs
on the last loop (len = 1024 or 1025). (ack from fat).

This issue where found from by static code analysis tool and, so,
I can't provide any reproducer.
 2012-11-28 10:35:04 +01:00