1
0
mirror of https://github.com/php/php-src.git synced 2026-04-27 01:48:26 +02:00
Commit Graph

3339 Commits

Author SHA1 Message Date
Anatol Belski 455741fce3 master renames phase 4 2014-08-25 20:57:25 +02:00
Anatol Belski 4d997f63d9 master renames phase 3 2014-08-25 20:22:49 +02:00
Anatol Belski 6f9f0bf205 master renames phase 2 2014-08-25 19:28:33 +02:00
Anatol Belski c3e3c98ec6 master renames phase 1 2014-08-25 19:24:55 +02:00
Anatol Belski 8d6ef99a39 Merge remote-tracking branch 'php/master' 2014-08-21 09:21:31 +02:00
Remi Collet dde4d2e628 Fix bug #67878 program_prefix not honoured in man pages
- add @program_prefix@ in php, phpize and php-config man pages
- set date to 2014
- fix "SEE ALSO" alignment
2014-08-21 09:13:12 +02:00
Anatol Belski fdbbe5fa30 fixed some incompatible types 2014-08-20 09:52:23 +02:00
Anatol Belski 07359785c3 Merge remote-tracking branch 'php/master' 2014-08-20 08:48:43 +02:00
Tjerk Meesters 285934a4c9 Fixed off-by-one memory allocation that could lead to invalid memory reads on strlen()
Always properly null terminate strings before ini parsing
Remove unnecessary memset() statements
2014-08-20 12:13:19 +08:00
Andrea Faulds 376e545b01 Merge branch 'fpmConfFix' of github.com:DaveRandom/php-src 2014-08-20 00:28:43 +01:00
Anatol Belski 61c8af6a9d ported apache handler 2014-08-19 23:39:22 +02:00
Anatol Belski 21f623e945 ported fcgi 2014-08-19 23:12:17 +02:00
Anatol Belski 63d3f0b844 basic macro replacements, all at once 2014-08-19 08:07:31 +02:00
Anatol Belski 77eb6e7278 Merge branch 'master' of git.php.net:php-src
# By Veres Lajos (2) and Lior Kaplan (1)
# Via Lior Kaplan
* 'master' of git.php.net:php-src:
  Correct typo in comments: 'initialized'
  typofixes
  typofixes
2014-08-17 21:40:39 +02:00
Anatol Belski 41115d3d9d regenerated parser files 2014-08-17 21:05:20 +02:00
Veres Lajos 1e3452992f typofixes 2014-08-17 16:00:39 +03:00
Anatol Belski 54906c760f increase the stack size for cli and cgi 2014-08-16 16:45:05 +02:00
Anatol Belski cb25136f4e fix macros in the 5 basic extensions 2014-08-16 11:37:14 +02:00
Dmitry Stogov 7497c8793d Merge branch 'master' into phpng
* master: (51 commits)
  Update Git rules
  Back to -dev (with EOL notice in NEWS)
  new NEWS block for the next release
  It's 2014 already, fix copyright year where user visible
  PHP 5.3.29
  Some changes were lost in the merge commit of #66091
  Updated NEWS for #66091
  Fixed #66091
  Updated NEWS for #66091
  Updated NEWS for #66091
  Fixed #66091
  updated NEWS
  updated NEWS
  updated NEWS
  backported the fix for bug #41577
  NEWS entry for e6d93a1 / d73d44c
  restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606
  Revert "Merge branch 'pull-request/694' into PHP-5.6"
  PHP 5.3.29RC1
  Fix missing type checks in various functions
  ...

Conflicts:
	ext/date/php_date.c
	ext/standard/math.c
2014-08-14 23:30:49 +04:00
Dmitry Stogov a08b7b7701 cleanup 2014-08-13 19:43:34 +04:00
Dmitry Stogov c1c913c5f1 cleanup (we don't have to duplicate elements of module_registry) 2014-08-13 17:05:18 +04:00
Dmitry Stogov 5a06ac88da cleanup (use zend_string* instead of char*) 2014-08-13 14:51:48 +04:00
Ferenc Kovacs 86aa8d2523 Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS entry for e6d93a1 / d73d44c
  restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606
  Revert "Merge branch 'pull-request/694' into PHP-5.6"
2014-08-12 14:48:48 +02:00
David Zuelke e6d93a11ad restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606 2014-08-09 08:26:33 +02:00
David Zuelke d73d44c237 Revert "Merge branch 'pull-request/694' into PHP-5.6"
This reverts commit d96de86b5b, reversing
changes made to b1e32a4f7a.
2014-08-09 08:14:23 +02:00
Dmitry Stogov 7301994c28 Merge branch 'master' into phpng
* master: (46 commits)
  PHP_INT_MIN and _MAX tests
  NEWS and UPGRADING
  Added PHP_INT_MIN
  Fix wrong lenght size
  Bug #51096 - Remove unnecessary ? for first/last day of
  Moved streams related functions to xp_ssl.c
  Remove duplicate NEWS
  Update NEWS
  Update NEWS
  Update NEWS
  BFN
  BFN
  Fixed bug #67715 (php-milter does not build and crashes randomly).
  We need to turn off any strict mode here for this warning to show up
  Disable restrictions regarding arrays in constants at run-time. For the discussion around it, see the thread on the mailing list: http://www.mail-archive.com/internals@lists.php.net/msg68245.html
  Revert "Fix bug #67064 in a BC safe way"
  Updated NEWS for #67693
  Updated NEWS for #67693
  Fixed bug #67693 - incorrect push to the empty array
  add missing entry to NEWS
  ...

Conflicts:
	Zend/tests/errmsg_040.phpt
	Zend/tests/ns_059.phpt
	Zend/zend_language_parser.y
	Zend/zend_vm_def.h
	ext/openssl/openssl.c
	ext/reflection/php_reflection.c
	ext/session/session.c
	ext/spl/spl_directory.c
	ext/spl/spl_iterators.c
	ext/sqlite3/sqlite3.c
	ext/standard/array.c
2014-08-04 13:56:27 +04:00
Michael Wallner 03f56152e5 Merge branch 'PHP-5.6'
* PHP-5.6:
  BFN
  BFN
  Fixed bug #67715 (php-milter does not build and crashes randomly).
2014-07-30 20:14:40 +02:00
Michael Wallner ceadf783fe Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  BFN
  Fixed bug #67715 (php-milter does not build and crashes randomly).
2014-07-30 20:13:39 +02:00
Michael Wallner 6ed9991a6f Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed bug #67715 (php-milter does not build and crashes randomly).
2014-07-30 20:12:50 +02:00
Michael Wallner 12b2127b72 Fixed bug #67715 (php-milter does not build and crashes randomly). 2014-07-30 20:12:13 +02:00
Xinchen Hui 235d0241d1 Merge branch 'PHP-5.5' into PHP-5.6 2014-07-25 10:52:41 +08:00
Dmitry Stogov f2a2fccece Merge branch 'master' into phpng
* master:
  fix nmake snap when ext name is different in target dll
  force atoll macro usage on windows
  Enable $ replacement in exif, ldap, pdo_pgsql and tidy
  See bug #67635
  NEWS
  NEWS
  improve previous, add message during configure
  Fixed bug #67635 php links to systemd libraries without using pkg-config
  Improve fix for #66608
  Fixed segfault with empty break
  New added opcodes don't need to be resloved
  Update NEWS
  Update NEWS
  Update NEWS
  Fixed bug #66827 Session raises E_NOTICE when session name variable is array
  implemented copy libs of core exts in phpize mode
  fix copy the ext dll into the prefix path in phpize mode
  fix default prefix in phpize mode
  fix file with zero size usage in phpize mode

Conflicts:
	Zend/zend_opcode.c
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
	ext/session/session.c
2014-07-22 15:42:17 +04:00
Remi Collet a9c8499d4b Merge branch 'PHP-5.6'
* PHP-5.6:
  See bug #67635
2014-07-20 11:16:09 +02:00
Remi Collet d55f23ea5a Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  See bug #67635
2014-07-20 11:15:59 +02:00
Remi Collet 658f7d77f9 See bug #67635
Improve previous fix:
- also rely on pkg-config for systemd < 209
- always check for header
- comments
2014-07-20 11:14:43 +02:00
Remi Collet 6055a53d34 Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  NEWS
  improve previous, add message during configure
  Fixed bug #67635 php links to systemd libraries without using pkg-config
2014-07-19 18:47:32 +02:00
Remi Collet d5d16b6278 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  NEWS
  improve previous, add message during configure
  Fixed bug #67635 php links to systemd libraries without using pkg-config
2014-07-19 18:46:46 +02:00
Remi Collet 144a083954 improve previous, add message during configure 2014-07-19 18:42:40 +02:00
Remi Collet 7b60315672 Fixed bug #67635 php links to systemd libraries without using pkg-config
Patch from pacho at gentoo dot org

Rely on pkg-config for systemd >= 209
Failback on old check
2014-07-19 18:40:20 +02:00
Xinchen Hui 110bf9c720 Merge remote-tracking branch 'origin/master' into phpng
Conflicts:
	Zend/zend_compile.h
	ext/openssl/xp_ssl.c
2014-07-18 16:25:43 +08:00
Rasmus Lerdorf 3b08082600 This test depends on expose_php being on 2014-07-14 08:22:05 -07:00
Rasmus Lerdorf 935bc5795f This test depends on expose_php being on 2014-07-14 08:21:57 -07:00
Rasmus Lerdorf 40955e27f7 This test depends on expose_php being on 2014-07-14 08:21:27 -07:00
Dmitry Stogov 32e477c98c Merge branch 'master' into phpng
* master: (40 commits)
  Bug #67609: TLS connections fail behind HTTP proxy
  Updated NEWS for #67594
  Updated NEWS for #67594
  Fix #67594 - invisible colon should be stripped off header name
  Updated NEWS for 34407
  Updated NEWS for 34407
  Updated NEWS for 34407
  Fix for bug #34407 - ucwords and title case
  fixed broken merged code
  Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.
  fixed broken merged code
  Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.
  Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.
  Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.
  Test output relies on expose_php being on
  1.2 is a problematic float to print out Lower the default display precision for this test
  The test output is dependent on expose_php ini
  fix makefile in phpize mode
  fixe output_as_table() when no ext was enabled
  fix end of stream exception when generating makefile
  ...

Conflicts:
	ext/standard/http_fopen_wrapper.c
	ext/standard/string.c
	sapi/cli/php_cli_server.c
2014-07-14 11:44:53 +04:00
Tjerk Meesters 3a9bdafeff Merge branch 'PHP-5.6' 2014-07-12 15:11:18 +08:00
Tjerk Meesters 4e3d9a52ac Merge branch 'PHP-5.5' into PHP-5.6 2014-07-12 15:09:47 +08:00
Tjerk Meesters 1684ba3c6f Fix #67594 - invisible colon should be stripped off header name 2014-07-12 12:45:50 +08:00
George Wang e05fb6ee01 fixed broken merged code 2014-07-11 15:02:02 -04:00
George Wang 2d7625a1b8 Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index. 2014-07-11 15:00:36 -04:00
George Wang ca8c94c917 fixed broken merged code 2014-07-11 14:57:55 -04:00