Commit Graph

522 Commits

Author SHA1 Message Date
Xinchen Hui
47c9027772 Bump year 2014-01-03 11:06:16 +08:00
Xinchen Hui
63dba7ec9d Remove outdate codes, make it clearer, although just a bit.. 2013-11-05 18:47:12 +08: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
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
Felipe Pena
b0dbf71466 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  - Removed PHP 6 checks
2012-08-21 20:15:48 -03:00
Felipe Pena
85fa4d7747 - Removed PHP 6 checks 2012-08-21 20:15:34 -03:00
Felipe Pena
018a9b321f Merge commit '15213768e6cc098ab4e53cacc3b5eb86fa85284a' into PHP-5.3 2012-06-07 14:18:34 -03:00
Felipe Pena
15213768e6 - Fixed bug #62227 (Invalid phar stream path causes crash) 2012-06-04 20:07:14 -03:00
David Soria Parra
c918ca57a7 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Replace $Revision$ with $Id$ in keyword expansion enable files
  Enable $Id$ expansion for files with the $Revision$ keyword

Conflicts:
	ext/mysqlnd/mysqlnd.h
2012-03-20 17:58:58 +01:00
David Soria Parra
f7b10abae9 Replace $Revision$ with $Id$ in keyword expansion enable files 2012-03-20 17:53:47 +01:00
Felipe Pena
e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Pierre Joye
72004f29c2 - restore correct window_size 2011-11-20 10:10:43 +00:00
Pierre Joye
f330c8ab4e - restore correct window_size 2011-11-20 10:10:43 +00:00
Pierre Joye
1e8fc920e1 - fix build, ansi c requires constant value, no expresion, even constant var 2011-11-19 23:09:12 +00:00
Pierre Joye
eeba0b5681 - fix build, ansi c requires constant value, no expresion, even constant var 2011-11-19 23:09:12 +00:00
Stanislav Malyshev
449907fb76 fix bug #60164 (Stubs of a specific length break phar_open_from_fp scanning for __HALT_COMPILER) 2011-11-19 04:59:56 +00:00
Stanislav Malyshev
22cbdd5cc5 fix bug #60164 (Stubs of a specific length break phar_open_from_fp scanning for __HALT_COMPILER) 2011-11-19 04:59:56 +00:00
Dmitry Stogov
4a25a7740d Fixed ZE specific compile warnings (Bug #55629) 2011-09-13 13:29:35 +00:00
Hannes Magnusson
8a83fee12a Fixed bug#52013 (Unable to decompress files in a compressed phar) 2011-08-29 14:19:54 +00:00
Hannes Magnusson
9e20746611 Fixed bug#52013 (Unable to decompress files in a compressed phar) 2011-08-29 14:19:54 +00:00
Xinchen Hui
4c2e6c1cf6 Initialize variable with fixed value for avoiding compile warnings 2011-08-07 11:13:27 +00:00
Xinchen Hui
cc42ac9d9b Initialize variable with fixed value for avoiding compile warnings 2011-08-07 11:13:27 +00:00
Felipe Pena
997f323e3a - Added ZEND_MOD_END macro to use in the end of zend_module_dep[] 2011-08-06 14:47:44 +00:00
Felipe Pena
707a8f70b8 - Added ZEND_MOD_END macro to use in the end of zend_module_dep[] 2011-08-06 14:47:44 +00:00
Felipe Pena
23e438594d - Make usage of new PHP_FE_END macro 2011-07-25 11:42:53 +00:00
Felipe Pena
4b30846b50 - Make usage of new PHP_FE_END macro 2011-07-25 11:35:02 +00:00
Ilia Alshanetsky
baf5d66614 Fixed bug #53898 (PHAR reports invalid error message, when the directory does not exist). 2011-02-01 14:01:00 +00:00
Ilia Alshanetsky
0927309852 Fixed bug #53898 (PHAR reports invalid error message, when the directory does not exist). 2011-02-01 14:01:00 +00:00
Felipe Pena
12d2104277 - Year++ 2011-01-01 02:48:19 +00:00
Felipe Pena
d90a33d51c - Year++ 2011-01-01 02:46:03 +00:00
Kalle Sommer Nielsen
701bfaa2fa Added second fix from #50987 that wasn't apart of Ilia's commit 2010-11-20 20:59:28 +00:00
Kalle Sommer Nielsen
78f10489ca Added second fix from #50987 that wasn't apart of Ilia's commit 2010-11-20 20:59:28 +00:00
Ilia Alshanetsky
3016ad46ae Fixed bug #50987 (unaligned memory access in phar.c) 2010-11-20 19:27:31 +00:00
Ilia Alshanetsky
5f1b91a6bf Fixed bug #50987 (unaligned memory access in phar.c) 2010-11-20 19:27:31 +00:00
Ilia Alshanetsky
676a8338a1 Fixed bug #51690 (Phar::setStub looks for case-sensitive __HALT_COMPILER()) 2010-05-03 14:41:40 +00:00
Ilia Alshanetsky
813e3cf14d Fixed bug #51690 (Phar::setStub looks for case-sensitive __HALT_COMPILER()) 2010-05-03 14:41:40 +00:00
Hannes Magnusson
3283b811eb - Unifiy that message
- Mention php.ini
2010-04-27 08:23:25 +00:00
Hannes Magnusson
8ba86768e7 - Unifiy that message
- Mention php.ini
2010-04-27 08:23:25 +00:00
Kalle Sommer Nielsen
cb30330800 Merge safe_mode changes into extensions that are in sync in both branches 2010-04-26 23:55:03 +00:00
Kalle Sommer Nielsen
dd8e59da8f Removed safe_mode
* Removed ini options, safe_mode*
 * Removed --enable-safe-mode --with-exec-dir configure options on Unix
 * Updated extensions, SAPI's and core
 * php_get_current_user() is now declared in main.c, thrus no need to include safe_mode.h anymore
2010-04-26 23:53:30 +00:00
Hannes Magnusson
267b5cea14 mention which setting! 2010-04-25 18:55:06 +00:00
Hannes Magnusson
b25baf178d mention which setting! 2010-04-25 18:55:06 +00:00
Dmitry Stogov
dd5c478be6 Added concept of interned strings. All strings constants known at compile time are allocated in a single copy and never changed. 2010-04-20 11:05:54 +00:00
Johannes Schlüter
26b08f9857 Remove main/php3_compat.h, for that a few references to function_entry have
to be replaced by `zend_function_entry`.
2010-03-30 23:03:02 +00:00
Rasmus Lerdorf
c06ac0ac8e Fix bug #50129 2009-11-09 17:21:15 +00:00
Rasmus Lerdorf
315b9956b6 Fix bug #50129 2009-11-09 17:21:15 +00:00