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
94,551 Commits 547 Branches 1,483 Tags
7174af40748ff0c2ac77481f5710ee20b41985fa
Commit Graph

4154 Commits

Author SHA1 Message Date
Lior Kaplan 85ce6a7d38 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Align spacing in make install messages
 2016-02-08 20:33:17 +02:00
Lior Kaplan fb7d673ef2 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Align spacing in make install messages
  Add entry for re-fix of #70976 in commit 14e4d393
 2016-02-08 20:29:24 +02:00
Lior Kaplan 6772fbff62 Align spacing in make install messages 2016-02-08 20:27:19 +02:00
Nikita Popov 1c709f08c7 Merge branch 'PHP-7.0' 2016-01-29 17:03:32 +01:00
Guillaume Outters 10b2172f01 phpdbg config.m4: make it detectable by old shells 
--enable-phpdbg is not detected on old systems (e.g.: stock FreeBSD 8), due to a PHPism in config.m4 (use of == operator).
Replacing == with the historic = makes it pass.
 2016-01-29 17:01:04 +01:00
Remi Collet e846801c79 Merge branch 'PHP-7.0' 
* PHP-7.0:
  NEWS
  NEWS
  Fixed Bug #62172 FPM not working with Apache httpd 2.4 balancer/fcgi setup
 2016-01-29 10:24:58 +01:00
Remi Collet c0802af52c Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  NEWS
  Fixed Bug #62172 FPM not working with Apache httpd 2.4 balancer/fcgi setup
 2016-01-29 10:24:15 +01:00
Remi Collet 07d2dcdf09 Fixed Bug #62172 FPM not working with Apache httpd 2.4 balancer/fcgi setup 
Only needed with Apache version < 2.4.12 (ex RHEL-7)
 2016-01-29 10:20:42 +01:00
Bob Weinand cc9445ce68 Merge branch 'PHP-7.0' 2016-01-23 18:17:18 +01:00
Bob Weinand 65ef7f8c33 Use uint64_t for flags (warning) 2016-01-23 18:16:57 +01:00
Nikita Popov af255c67eb Make op1/op2 decoding in phpdbg more complete 2016-01-21 21:58:23 +01:00
Anatol Belski 60d98605ca reorder comments 2016-01-19 09:04:52 +01:00
Anatol Belski 03263fded1 get rid of win32_ prefix 2016-01-19 09:02:12 +01:00
Anatol Belski fb1f4769b9 check return values and cleanup the job object on exit 2016-01-19 08:57:58 +01:00
Anatol Belski 8e60e0c927 trap also children exits on shutdown to avoid unhandled exceptions 2016-01-18 20:52:17 +01:00
Anatol Belski 5af056a662 Merge branch 'PHP-7.0' 
* PHP-7.0:
  fork test
  fix test
  fork test
  fork test for win32
  fork test
 2016-01-18 17:02:58 +01:00
Anatol Belski 71dbad172f Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fork test
  fix test
  fork test
  fork test for win32
  fork test
 2016-01-18 17:02:23 +01:00
Anatol Belski 5673ede6e9 fix test 2016-01-18 16:52:48 +01:00
Anatol Belski 91545ce3a2 add WinEditLine support for CLI 2016-01-15 12:45:57 +01:00
Xinchen Hui da658f28bb Merge branch 'patch' of https://github.com/jakkdu/php-src 
* 'patch' of https://github.com/jakkdu/php-src:
  phpdbg: fix potential format string bug
 2016-01-14 11:51:53 +08:00
Anatol Belski 092a87c9d8 implement FCGI children automatic restart and cleanup 2016-01-13 21:32:38 +01:00
Anatol Belski 5b91658365 Basic implementation for FCGI to respect PHP_FCGI_CHILDREN on Windows 
PHP_FCGI_CHILDREN number of children processes will be spawned, sharing
same TCP socket. To implement yet

- children cleanup on exit
- automatic children re-spawning
 2016-01-13 21:32:36 +01:00
Insu Yun 35d5cd5c6e phpdbg: fix potential format string bug 2016-01-12 04:21:57 +00:00
Anatol Belski 765c5ca745 Merge branch 'PHP-7.0' 
* PHP-7.0:
  update NEWS
  update NEWS
  Simplify code per Anatol.
  Insert bug number.
  Use strtoll() when apr_off_t is 64 bits.
 2016-01-11 21:45:42 +01:00
Anatol Belski ce568f98bf Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Simplify code per Anatol.
  Insert bug number.
  Use strtoll() when apr_off_t is 64 bits.
 2016-01-11 21:39:31 +01:00
Adam Harvey f301a0b23c Simplify code per Anatol. 2016-01-11 21:36:55 +01:00
Adam Harvey 3217c033a5 Insert bug number. 2016-01-11 21:36:53 +01:00
Adam Harvey c895dc5b5b Use strtoll() when apr_off_t is 64 bits. 2016-01-11 21:36:51 +01:00
Anatol Belski ea130bfd59 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Update NEWS
  add NEWS entries for 7.0.2
  re-apply the patch from 1785d2b805
  Improve fix for bug #70976
  Fix bug #70976: fix boundary check on gdImageRotateInterpolated
  Fixed bug #70755: fpm_log.c memory leak and buffer overflow
  fix merge mistake
  Fixed #70728
  Fixed bug #70661 (Use After Free Vulnerability in WDDX Packet Deserialization)
  Improve fix for bug #70976
  Fixed bug #70661 (Use After Free Vulnerability in WDDX Packet Deserialization)
  Fixed bug #70741: Session WDDX Packet Deserialization Type Confusion Vulnerability
  Fixed #70728
  Fixed bug #70755: fpm_log.c memory leak and buffer overflow
  Fix bug #70976: fix boundary check on gdImageRotateInterpolated
  typofix
 2016-01-06 06:10:39 +01:00
Anatol Belski c0928be7f8 Merge remote-tracking branch 'phpsec/PHP-7.0' into PHP-7.0 
* phpsec/PHP-7.0:
  add NEWS entries for 7.0.2
  re-apply the patch from 1785d2b805
  Improve fix for bug #70976
  Fix bug #70976: fix boundary check on gdImageRotateInterpolated
  Fixed bug #70755: fpm_log.c memory leak and buffer overflow
  fix merge mistake
  Fixed #70728
  Fixed bug #70661 (Use After Free Vulnerability in WDDX Packet Deserialization)
 2016-01-06 06:09:12 +01:00
Stanislav Malyshev 13750cb0a1 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Update NEWS
  Improve fix for bug #70976
  Fixed bug #70661 (Use After Free Vulnerability in WDDX Packet Deserialization)
  Fixed bug #70741: Session WDDX Packet Deserialization Type Confusion Vulnerability
  Fixed #70728
  Fixed bug #70755: fpm_log.c memory leak and buffer overflow
  Fix bug #70976: fix boundary check on gdImageRotateInterpolated
  typofix
 2016-01-05 19:38:29 -08:00
George Wang 69112d7e97 Fixed runtime php.ini override, ini name length is off by 1. 
(cherry picked from commit 5bcb7a7019)
 2016-01-05 23:48:42 +02:00
Julien Pauli 928d2cb3a4 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Happy new year (Update copyright to 2016)
 2016-01-04 18:14:08 +01:00
Julien Pauli 736b91c650 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Happy new year (Update copyright to 2016)

Conflicts:
	ext/json/php_json_encoder.h
	sapi/continuity/capi.c
 2016-01-04 18:13:38 +01:00
Stanislav Malyshev 2eaa755660 Fixed bug #70755: fpm_log.c memory leak and buffer overflow 2016-01-04 17:36:42 +01:00
Lior Kaplan 53fb2f1e5c Happy new year (Update copyright to 2016) 2016-01-03 01:44:37 +02:00
Lior Kaplan 3d5438bf7b Merge branch 'PHP-7.0' 
* PHP-7.0:
  Update header to PHP Version 7
  Happy new year (Update copyright to 2016)
  Happy new year (Update copyright to 2016)
 2016-01-01 20:04:31 +02:00
Lior Kaplan 2eb1f38d24 Happy new year (Update copyright to 2016) 2016-01-01 20:03:16 +02:00
Lior Kaplan ed35de784f Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Happy new year (Update copyright to 2016)
 2016-01-01 19:48:25 +02:00
Lior Kaplan 49493a2dcf Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
Xinchen Hui 41dcdb1d73 Merge branch 'PHP-7.0' 2016-01-01 13:46:44 +08:00
Xinchen Hui 05defb4f56 Fixed test after fix lineno of finally 2016-01-01 13:46:19 +08:00
Julien Pauli ea12ff149c Added support for HTTP 451 2015-12-23 11:31:18 +01:00
George Wang 21eaa5a47d Merge branch 'master' of git.php.net:php-src 2015-12-17 15:25:39 -05:00
George Wang 70addd33d0 Fixed a bug in apache_request_headers() that adds an extra \0 to header name. 2015-12-17 15:24:59 -05:00
George Wang 0a1a4dc033 Fixed a bug in apache_request_headers() that adds an extra \0 to header name. 2015-12-17 15:20:08 -05:00
Bob Weinand 817ed01320 Merge PR #1638 (Fix naming of global section in fpm_conf_dump()) 2015-12-16 16:46:17 +01:00
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