1
0
mirror of https://github.com/php/php-src.git synced 2026-04-26 09:28:21 +02:00
Commit Graph

553 Commits

Author SHA1 Message Date
Michael Wallner 14caf174ff unify stdint type usage
if you need C99 stdint types, just include "php_stdint.h"
2013-08-06 22:49:56 +02:00
Nikita Popov 43cbec0fa9 Fix phar phpinfo test after markup changes 2013-08-03 16:32:02 +02:00
Christopher Jones 1c91ca990f Merge branch 'PHP-5.5'
* PHP-5.5:
  Revert "Allow 'make distclean' to clean up the 'generated' phar.inc"
2013-08-01 08:49:19 -07:00
Christopher Jones 146b933ab4 Revert "Allow 'make distclean' to clean up the 'generated' phar.inc"
This reverts commit 017145bc57.
2013-08-01 08:47:13 -07:00
Christopher Jones 1f6b940dd1 Merge branch 'PHP-5.5'
* PHP-5.5:
  Use PHP's major version when cleaning up Apache .module files
  Allow 'make distclean' to clean up the 'generated' phar.inc
2013-07-31 12:36:20 -07:00
Christopher Jones 017145bc57 Allow 'make distclean' to clean up the 'generated' phar.inc 2013-07-31 12:31:50 -07:00
Andrey Hristov 92d27ccb05 Constify streams API and a few other calls down the rabbit hole.
(`char *` to `const char *` for parameters and few return values)
In a few places int len moved to size_t len.
2013-07-30 12:49:36 +02:00
Stanislav Malyshev b8c8a04a85 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix bug #65028 	Phar::buildFromDirectory creates corrupt archives for some specific contents
2013-07-23 21:45:35 -07:00
Stanislav Malyshev f8efdc2b4b fix bug #65028 Phar::buildFromDirectory creates corrupt archives for some specific contents 2013-07-22 00:57:33 -07:00
Veres Lajos 4749457a49 HASH_KEY_NON_EXISTANT fix 2013-07-21 20:09:53 -07:00
Remi Collet 8f0567581e Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed Bug #65142 Missing phar man page
  NEWS
  Fixed Bug #65143 Missing php-cgi man page
2013-07-02 10:47:38 +02:00
Remi Collet f4ce5e7fb6 Fixed Bug #65142 Missing phar man page
Simple man page from phar help output.
2013-07-02 10:46:50 +02: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
Pierre Joye 40d5458eff Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  entry for #64214
  other fix for #64214, unmodified file may not have old fp set, causing other possible crashes
2013-05-17 11:50:52 +02:00
Pierre Joye aff65a0346 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  entry for #64214
  other fix for #64214, unmodified file may not have old fp set, causing other possible crashes
2013-05-17 11:49:33 +02:00
Pierre Joye 3eb1745643 other fix for #64214, unmodified file may not have old fp set, causing other possible crashes 2013-05-17 11:45:13 +02:00
Pierre Joye 42a186e22d Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  more check for php_stream_fopen_tmpfile failure
2013-05-14 16:46:32 +02:00
Pierre Joye 7ec2e5314e Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  more check for php_stream_fopen_tmpfile failure
2013-05-14 16:45:56 +02:00
Pierre Joye ba1af29805 more check for php_stream_fopen_tmpfile failure 2013-05-14 16:45:11 +02:00
Pierre Joye 362402d748 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  php_stream_fopen_tmpfile may file, causing any following stream usage to crash
2013-05-14 09:21:30 +02:00
Pierre Joye f37c54ab27 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  php_stream_fopen_tmpfile may file, causing any following stream usage to crash
2013-05-14 09:21:17 +02:00
Pierre Joye 533e636a62 php_stream_fopen_tmpfile may file, causing any following stream usage to crash 2013-05-14 09:20:53 +02:00
Nikita Popov c2893ab592 Missed two occurances of Revision: 2013-03-23 21:09:20 +01:00
Nikita Popov 01583bdc36 phar phpinfo uses Id instead of Revision 2013-03-23 20:11:06 +01:00
Dmitry Stogov e9641141aa Made test compatible with O+ 2013-03-16 16:11:00 +04:00
Nikita Popov fcc6611de9 Add support for non-scalar Iterator keys in foreach
RFC: https://wiki.php.net/rfc/foreach-non-scalar-keys
2013-03-12 17:27:31 +01:00
Dmitry Stogov 8b7222e22f Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  PHAR should modify entry timestamp when it's modified
2013-02-21 16:08:07 +04:00
Dmitry Stogov b5d267aa95 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  PHAR should modify entry timestamp when it's modified
2013-02-21 15:57:26 +04:00
Dmitry Stogov 7b113d789d PHAR should modify entry timestamp when it's modified 2013-02-21 15:55:20 +04:00
Xinchen Hui cbb5d42b9b Merge branch 'PHP-5.4' into PHP-5.5 2013-01-06 10:23:21 +08:00
Xinchen Hui c2f8e90504 Merge branch 'PHP-5.3' into PHP-5.4 2013-01-06 10:20:00 +08:00
Xinchen Hui bc11e6fdbb bump year 2013-01-06 10:19:09 +08:00
Sebastian Bergmann eab14993fe Invoke re2c with --no-generation-date to prevent unintentional / unnecessary changes in generated files. 2012-12-06 09:28:35 +01:00
Anatoliy Belsky bc910a7ce4 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed test for bug #63297
2012-11-22 19:05:31 +01:00
Anatoliy Belsky dc862f4fd4 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed test for bug #63297
2012-11-22 19:04:49 +01:00
Anatoliy Belsky 1702024073 Fixed test for bug #63297 2012-11-22 19:01:09 +01:00
Anatoliy Belsky f962260081 merged changes for bug #63297 from 5.3 2012-10-25 09:40:21 +02:00
Anatoliy Belsky 6e23cfeba4 fixed a typo in the error message 2012-10-25 09:26:44 +02:00
Anatoliy Belsky a88379e03d Fixed bug #63297 Phar fails to write an openssl based signature
Unitialized values warnings seem to be everyday life
when working with openssl. For more read
http://www.openssl.org/support/faq.html#PROG13
So just fixing so the bug, no care about those
warnings.
2012-10-24 13:38:44 +02:00
Anatoliy Belsky f734c0a7ca Merge branch 'PHP-5.4'
* PHP-5.4:
  merged changes for bug #63297 from 5.3

Conflicts:
	NEWS
2012-10-25 09:42:18 +02:00
Xinchen Hui 69a4301f6c Merge branch 'PHP-5.3' into PHP-5.4 2012-10-10 10:45:07 +08:00
Xinchen Hui 1b9e0de2cc Remove executable permission on inc 2012-10-10 10:44:34 +08:00
Xinchen Hui e081c55fb5 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-10 10:31:31 +08:00
Xinchen Hui 610c7fbe7b Remove executable permission on phpt 2012-10-10 10:27:49 +08:00
Xinchen Hui 4e5e8c9da0 Merge branch 'PHP-5.4' 2012-10-10 10:45:34 +08:00
Xinchen Hui 4b152e5470 Merge branch 'PHP-5.4' 2012-10-10 10:32:38 +08:00
Xinchen Hui 55d680e968 better fix 2012-08-24 18:21:49 +08:00
Xinchen Hui 7bedd275eb Fix test 2012-08-24 18:18:38 +08:00
Felipe Pena 8830cd5be4 Merge branch 'PHP-5.4'
* PHP-5.4:
  - Removed PHP 6 checks
2012-08-21 20:16:12 -03:00