Commit Graph

1039 Commits

Author SHA1 Message Date
Stanislav Malyshev
78cffe0c4d 5.4.7 branched 2012-08-28 22:07:08 -07:00
Adam Harvey
14847af41d Update version numbers to 5.4.7-dev. 2012-08-17 23:07:54 +08:00
Nikita Popov
f4ce364628 Merge remote-tracking branch 'php-src/master' into addGeneratorsSupport
This is just an intial merge. It does not yet make generators and finally
work together.

Conflicts:
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner_defs.h
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
	Zend/zend_vm_execute.skl
	Zend/zend_vm_opcodes.h
2012-08-13 16:54:53 +02:00
Andrew Faulds
d12f8d6790 Removed Logo GUIDs and replaced with Data URIs and div hidden with JS
- removed php_logo_guid()
- removed php_egg_logo_guid()
- removed php_real_logo_guid()
- removed zend_logo_guid()
- removed logo GUID handling
- removed logo GUIDs from source
- added logo data URIs instead for phpinfo()
- added credits to phpinfo() page, but hidden by default
2012-07-14 21:44:21 +01:00
Nikita Popov
ca59e5464d Add empty Generator class 2012-05-20 00:03:27 +02:00
Stanislav Malyshev
be8b1c74cf to 5.4.5-dev 2012-05-15 22:46:49 -07:00
Christopher Jones
d9788dd73f Bump to 5.4.4-dev 2012-05-14 12:43:36 -07:00
Christopher Jones
31ab04ee25 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Bump to next version

Conflicts:
	configure.in
	main/php_version.h
2012-05-03 12:22:39 -07:00
Christopher Jones
0956c00af9 Bump to next version
Bump PHP version number
2012-05-03 12:03:49 -07:00
Stanislav Malyshev
7d3d38abec sync version 2012-04-24 16:30:37 -07:00
David Soria Parra
30aee4b861 Merge branch 'PHP-5.4'
* PHP-5.4:
  configure.in: Check for README.GIT-RULES instead of README.SVN-RULES
2012-04-13 16:33:43 +02:00
David Soria Parra
de6dfe5bbd Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  configure.in: Check for README.GIT-RULES instead of README.SVN-RULES

Conflicts:
	configure.in
2012-04-13 16:33:25 +02:00
David Soria Parra
e9b978c374 configure.in: Check for README.GIT-RULES instead of README.SVN-RULES
We removed the README.SVN-RULES file. Configure checks for this file.
Let's check for the new README.GIT-RULES instead.
2012-04-13 16:32:41 +02:00
Johannes Schlüter
fb124764de This will be PHP 5.3.12 2012-03-29 11:22:44 +02:00
Hannes Magnusson
54d82a962c Merge branch 'PHP-5.4'
* PHP-5.4:
  This is a git checkout
  Revert incorrect fix
2012-03-24 17:20:36 +01:00
Hannes Magnusson
7a1c765385 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  This is a git checkout
  Revert incorrect fix
2012-03-24 17:20:14 +01:00
Hannes Magnusson
4fc4dd8760 This is a git checkout 2012-03-24 17:16:50 +01:00
Christopher Jones
949ef40139 Fixed bug #61172 (Add Apache 2.4 support) 2012-03-02 00:07:41 +00:00
Christopher Jones
730b54a374 Fixed bug #61172 (Add Apache 2.4 support) 2012-03-02 00:07:41 +00:00
Christopher Jones
15cd45e95e Fixed bug #61172 (Add Apache 2.4 support) 2012-03-02 00:07:41 +00:00
Stanislav Malyshev
23c62eb080 back to dev 2012-02-29 07:24:27 +00:00
Stanislav Malyshev
bfd72d0386 5.4.0 2012-02-29 07:22:43 +00:00
Stanislav Malyshev
6561d47e55 back to dev 2012-02-16 07:47:02 +00:00
Stanislav Malyshev
c1d415f798 5.4.0rc8 2012-02-16 07:45:08 +00:00
Stanislav Malyshev
9e9683b6b0 back to dev 2012-02-02 17:29:00 +00:00
Stanislav Malyshev
29e2f050f5 retag 5.4.0 rc7 2012-02-02 17:28:03 +00:00
Johannes Schlüter
1e16c821aa This will be PHP 5.3.11, 5.3.10 will be released from other branch 2012-02-02 17:25:23 +00:00
Stanislav Malyshev
3a95557cc3 back to dev 2012-02-02 06:09:50 +00:00
Stanislav Malyshev
9e9d6d3aaf 5.4.0 rc7 2012-02-02 06:08:29 +00:00
Michael Wallner
65948ec354 LTP/gcov/lcov
- allow ltp v1.9
- make sure `test`s are catched by `if`s
- introduce LCOV_INCLUDE make variable, simple coverage for your extension:
  ./configure --enable-gcov && make lcov TESTS=~/src/pecl/http/test LCOV_INCLUDE=/http/
  coverage takes just a few seconds instead of a few minutes for the full source tree
2012-01-23 09:48:18 +00:00
Stanislav Malyshev
cbdfc93154 back to dev 2012-01-19 06:29:15 +00:00
Stanislav Malyshev
44c773120e 5.4.0RC6 2012-01-19 06:27:56 +00:00
Johannes Schlüter
93ee94adb6 We should be back to -dev ... 2012-01-15 19:51:36 +00:00
Johannes Schlüter
3eb4b024ee PHP 5.3.9 2012-01-10 11:21:57 +00:00
Stanislav Malyshev
64a9019171 back to dev 2012-01-05 07:24:26 +00:00
Stanislav Malyshev
6cb0b66053 5.4.0rc5 2012-01-05 07:22:29 +00:00
Johannes Schlüter
af07705f97 Back to -dev 2011-12-22 12:36:40 +00:00
Johannes Schlüter
712be66d05 PHP 5.3.9RC4 2011-12-22 12:33:04 +00:00
Stanislav Malyshev
48a688ffa0 back to dev 2011-12-22 03:27:00 +00:00
Stanislav Malyshev
1a79692791 5.4.0rc4 2011-12-22 03:25:28 +00:00
Johannes Schlüter
451263f7d0 - Back to -dev 2011-12-08 13:46:45 +00:00
Johannes Schlüter
4307bd57db - 5.3.9RC3 2011-12-08 11:01:37 +00:00
Stanislav Malyshev
8559b09566 back to dev 2011-12-08 07:17:27 +00:00
Stanislav Malyshev
00f2a9b2ba 5.4.0rc3 2011-12-08 07:15:44 +00:00
Felipe Pena
37eba77f31 - Escape [ ] chars in the configure message
Patch by: Daniel Convissor
2011-12-01 16:40:07 +00:00
Felipe Pena
2b25c9377e - Escape [ ] chars in the configure message
Patch by: Daniel Convissor
2011-12-01 16:40:07 +00:00
Johannes Schlüter
fb573462ca - Back to -dev 2011-11-24 14:00:10 +00:00
Johannes Schlüter
e9087c9d4a - PHP 5.3.9RC2 2011-11-24 12:57:59 +00:00
Stanislav Malyshev
c05614fb6d back to dev 2011-11-24 05:04:25 +00:00
Stanislav Malyshev
953016b6b9 5.4.0RC2 2011-11-24 05:03:22 +00:00
Felipe Pena
3d19038838 - Fixed bug #55874 (GCC does not provide __sync_fetch_and_add on some archs)
patch by: klightspeed at netspace dot net dot au
2011-11-15 20:33:26 +00:00
Felipe Pena
42776c0259 - Fixed bug #55874 (GCC does not provide __sync_fetch_and_add on some archs)
patch by: klightspeed at netspace dot net dot au
2011-11-15 20:33:26 +00:00
Felipe Pena
8e6a9d469a - Fixed bug #55874 (GCC does not provide __sync_fetch_and_add on some archs)
patch by: klightspeed at netspace dot net dot au
2011-11-15 20:33:26 +00:00
Stanislav Malyshev
7f6c7422a8 back to dev 2011-11-10 06:27:37 +00:00
Stanislav Malyshev
07f2c01bd2 5.4.0 RC1 2011-11-10 06:26:25 +00:00
Johannes Schlüter
98dfe36852 Back to -dev 2011-11-03 15:26:34 +00:00
Johannes Schlüter
60937c2cf6 - PHP 5.3.9RC1 2011-11-03 15:08:19 +00:00
Stanislav Malyshev
93f654e64f back to dev 2011-10-20 06:06:35 +00:00
Stanislav Malyshev
91a04638e6 5.4.0beta2 2011-10-20 06:05:30 +00:00
Ilia Alshanetsky
4ee578f8a1 Fixed bug #60019 (Function time_nanosleep() is undefined on OS X). 2011-10-14 12:43:27 +00:00
Ilia Alshanetsky
136a9ca2cc Fixed bug #60019 (Function time_nanosleep() is undefined on OS X). 2011-10-14 12:43:27 +00:00
Ilia Alshanetsky
f1eaaa5dc6 Fixed bug #60019 (Function time_nanosleep() is undefined on OS X). 2011-10-14 12:43:27 +00:00
Stanislav Malyshev
f5b8a3b40e back to dev 2011-09-15 06:25:52 +00:00
Stanislav Malyshev
fe85ca8737 5.4.0beta 2011-09-15 06:24:18 +00:00
Johannes Schlüter
5f502879ff Back to -dev 2011-08-22 23:24:22 +00:00
Johannes Schlüter
952b9a9695 - PHP 5.3.8 2011-08-22 22:08:48 +00:00
Ilia Alshanetsky
eb1470aa3f Back to dev 2011-08-17 14:28:24 +00:00
Ilia Alshanetsky
6e284c6ce7 5.3.7 2011-08-17 13:30:04 +00:00
Ilia Alshanetsky
d090061f5e Back to dev 2011-08-11 14:35:08 +00:00
Ilia Alshanetsky
db472c60cf 5.3.7RC5 2011-08-11 13:02:49 +00:00
Stanislav Malyshev
3e7ce20a5b back to dev 2011-08-03 17:14:26 +00:00
Stanislav Malyshev
7c289f7f8e 5.4.0alpha3 2011-08-03 17:12:44 +00:00
Ilia Alshanetsky
5b0373b060 back to dev 2011-07-28 11:54:53 +00:00
Ilia Alshanetsky
d69796f23f 5.3.7RC4 2011-07-28 11:53:46 +00:00
Pierre Joye
9805e1674a - remove magic quotes support, functions are kept (see the NEWS entry for the details) for BC reasons but do not allow to set enable MQ 2011-07-22 11:25:30 +00:00
Pierre Joye
cc1c7af037 - remove magic quotes support, functions are kept (see the NEWS entry for the details) for BC reasons but do not allow to set enable MQ 2011-07-22 11:25:30 +00:00
Ilia Alshanetsky
329449f799 Back to dev 2011-07-14 12:02:33 +00:00
Ilia Alshanetsky
894cfb078b 5.3.7RC3 2011-07-14 12:01:37 +00:00
Stanislav Malyshev
11a096c3cc Back to -dev 2011-07-14 05:39:29 +00:00
Stanislav Malyshev
6f0c93da8e 5.4.0 alpha2 2011-07-14 05:37:40 +00:00
Ilia Alshanetsky
8f80896718 Back to dev 2011-06-30 13:31:39 +00:00
Ilia Alshanetsky
05763e18bb 5.3.7RC2 2011-06-30 13:16:27 +00:00
Ilia Alshanetsky
34d93f0c06 Zend Signal Handling 2011-06-22 14:23:21 +00:00
Stanislav Malyshev
603252546b Back to -dev 2011-06-19 20:15:33 +00:00
Stanislav Malyshev
ed87dbab91 5.4.0 alpha11 2011-06-19 20:11:54 +00:00
Johannes Schlüter
262492a187 - Back to -dev 2011-06-16 12:47:39 +00:00
Johannes Schlüter
06d5c9a8f0 5.3.7RC1 2011-06-16 12:40:37 +00:00
Christopher Jones
9622d0050d Relax autoconf support from 2.60 to 2.59. This is the version available on Centos/RHEL/Oracle Linux 5.6 2011-06-08 01:25:35 +00:00
Christopher Jones
2e235022e9 Relax autoconf support from 2.60 to 2.59. This is the version available on Centos/RHEL/Oracle Linux 5.6 2011-06-08 01:25:35 +00:00
Ilia Alshanetsky
939875133a Zend Signal Handling (see RFC: https://wiki.php.net/rfc/zendsignals)
This needs to go into 5.4 as well, but will wait for Pierre to review win32 situation

# Patch by Lucas Nealan, Arnaud Le Blanc, Brian Shire & Ilia Alshanetsky
2011-06-02 21:16:50 +00:00
Rasmus Lerdorf
353077d234 Get rid of autoconf warnings 2011-05-16 00:14:47 +00:00
Rasmus Lerdorf
cc8ecca0b3 Get rid of autoconf warnings 2011-05-16 00:14:47 +00:00
Rasmus Lerdorf
6f9d0a25fd Make the version match the branch 2011-05-15 06:16:37 +00:00
Rasmus Lerdorf
438cc7f201 Drop support for autoconf < 2.60 in trunk and the
new PHP_5_4 branch. autoconf >= 2.60 should finally
be working now.
2011-05-15 06:09:21 +00:00
Rasmus Lerdorf
245d15fdc6 Drop support for autoconf < 2.60 in trunk and the
new PHP_5_4 branch. autoconf >= 2.60 should finally
be working now.
2011-05-15 06:09:21 +00:00
Hannes Magnusson
a0d805035c Expose PHP_MANDIR
Useful for apps (like the pear installer, phd, .. etc) to install their manpages into the same dir as php did :]
2011-04-18 09:50:32 +00:00
Hannes Magnusson
e9bc36522a Expose PHP_MANDIR
Useful for apps (like the pear installer, phd, .. etc) to install their manpages into the same dir as php did :]
2011-04-18 09:50:32 +00:00
Johannes Schlüter
27e640fdea - Back to dev 2011-03-17 10:13:20 +00:00
Johannes Schlüter
f5687db392 PHP 5.3.6 2011-03-17 07:48:29 +00:00
Johannes Schlüter
5009770d65 - PHP 5.3.6RC3 2011-03-09 16:37:58 +00:00
Johannes Schlüter
bf5a3715f4 Back to -dev 2011-03-02 22:03:38 +00:00
Johannes Schlüter
0ec8364402 PHP 5.2.6RC2 2011-03-02 21:26:43 +00:00
Johannes Schlüter
18127da570 Back to -dev 2011-02-16 20:41:24 +00:00
Johannes Schlüter
02d03711ec PHP 5.3.6RC1 2011-02-16 20:20:33 +00:00
Johannes Schlüter
df344ea7d6 - This will be PHP 5.3.6 2011-01-05 13:39:30 +00:00
Johannes Schlüter
78a2762e88 Back to -dev 2010-12-08 22:48:36 +00:00
Johannes Schlüter
3d76289c59 PHP 5.3.4 2010-12-08 21:38:51 +00:00
Johannes Schlüter
094bcdff8b - Back to -dev 2010-12-02 14:34:32 +00:00
Johannes Schlüter
f915973c1e - PHP 5.3.4RC2 2010-12-02 13:59:38 +00:00
Johannes Schlüter
63f65b6e8f Back to -dev 2010-11-18 19:03:59 +00:00
Johannes Schlüter
7a8d9ad16a - 5.3.4RC1 2010-11-18 17:57:54 +00:00
Jani Taskinen
25aee9cad9 - Implemented FR #53271, FR #52410 (Building multiple PHP binary SAPIs and one SAPI module the same time)
# Bug #53271, Bug #52410
2010-11-13 23:13:07 +00:00
Jani Taskinen
200dcee22d - Simplified the DTrace configure macros, one is enough 2010-11-13 22:22:51 +00:00
Jani Taskinen
f017a9c93a - WS + cleanup
# Note:
# Considering DTrace support: Why does it really need any configure time stuff?
# 3 macros for static stuff that could be made much cleaner with simple Makefile.dtrace
# addition. The only thing required in configure is that --enable flag part..
#
2010-11-13 11:12:07 +00:00
Jani Taskinen
47713462ce - WS 2010-11-13 11:07:38 +00:00
Jani Taskinen
309a56f3f7 - Fixed -g adding for gcc and g++ (former got it twice, latter not at all) 2010-11-02 09:58:08 +00:00
Jani Taskinen
309aefc7e7 - Fixed -g adding for gcc and g++ (former got it twice, latter not at all) 2010-11-02 09:58:08 +00:00
Antony Dovgal
421b86ed5e fix bug #50345 (nanosleep not detected properly on some solaris versions) 2010-10-05 13:43:35 +00:00
Antony Dovgal
444ea3c911 fix bug #50345 (nanosleep not detected properly on some solaris versions) 2010-10-05 13:43:35 +00:00
Johannes Schlüter
200b139c69 - Back to -dev 2010-07-22 11:08:31 +00:00
Johannes Schlüter
6212b88ef3 - PHP 5.3.3 2010-07-21 10:50:07 +00:00
Johannes Schlüter
50554563af Back to -dev 2010-07-14 23:40:42 +00:00
Johannes Schlüter
6d85947b52 PHP 5.3.3RC3 2010-07-14 23:01:42 +00:00
Johannes Schlüter
c06a26a524 Back to -dev 2010-07-02 07:32:05 +00:00
Johannes Schlüter
2b48156eab 5.3.3 RC2 2010-07-01 15:44:18 +00:00
Johannes Schlüter
d52e132203 back to -dev 2010-06-18 08:22:14 +00:00
Johannes Schlüter
8661e8d298 PHP 5.3.3RC1 2010-06-17 17:16:57 +00:00
Antony Dovgal
e68ffa09e0 make the code more readable 2010-05-07 15:17:34 +00:00
David Soria Parra
4e177642c6 Abort if DTrace is not installed on the system 2010-05-07 15:05:39 +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
David Soria Parra
08b9fdc8a3 Add DTrace probes 2010-04-24 13:32:30 +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
Antony Dovgal
913970cebf simplify configure check for nanosleep() 2010-04-13 12:41:46 +00:00
Antony Dovgal
be23f26ca9 simplify configure check for nanosleep() 2010-04-13 12:41:46 +00:00
Sebastian Bergmann
880bde60a2 Fix version. 2010-03-23 21:19:18 +00:00
Andrei Zmievski
f92fae2f66 I am sorry I tried fixing PHP without extensive discussion on the mailing list.
I am sorry I tried fixing PHP without extensive discussion on the mailing list.
I am sorry I tried fixing PHP without extensive discussion on the mailing list.

Hope all the relevant parties are satisfied.
2010-03-18 22:37:25 +00:00
Andrei Zmievski
3220f15ca2 Fix a few problems with large (2G-4G) file uploads. Added
--enable-large-uploads-fix switch because one change was in SAPI.h structure.
2010-03-18 21:07:38 +00:00
David Soria Parra
e3f76cc8c3 Revert commit 292222. It's not needed anymore to specify c99. 2010-01-12 09:28:02 +00:00
Johannes Schlüter
d046bf5d8e PHP 5.3.2RC1 2009-12-22 22:02:50 +00:00
Jani Taskinen
294401cfa0 - Fixed bug #50517 (EXTRA_LDFLAGS polluted by wrong entries)
# Until someone shows me use case for LDFLAGS, this is gone.
# This was wrong place to import it anyway.
2009-12-22 09:57:19 +00:00
Jani Taskinen
52f83608d8 - Fixed bug #50508 (compile fails: Conflicting HEADER type declarations)
# NEVER ever include nameser_compat.h, it's included in various ways in different OSes by nameser.h if needed
2009-12-18 11:02:07 +00:00
Sriram Natarajan
cbc6619fe3 - Fixed bug #50496 (Use of <stdbool.h> is valid only in a c99 compilation environment.) 2009-12-16 20:49:08 +00:00
Jani Taskinen
4e10081f8f - Make $sbindir be usable in C code as well (like $bindir and co.) 2009-12-15 11:17:47 +00:00
Jani Taskinen
def4e7c0e6 - Allow using $sbindir as well 2009-12-15 10:55:27 +00:00
Jani Taskinen
14c70e0959 - Fixed bug #50345 (nanosleep not detected properly on some solaris versions) 2009-12-02 08:54:50 +00:00
Gwynne Raskind
b2cc8c69dc The old Darwin hack is BROKEN and INCORRECT. It works only for Darwin 9, not 10, and uses an ugly CFLAGS hack that messes with the entire build. This version sets one cached value to the correct result for Darwin 9 and 10. It's cleaner, has no side effects, has nothing to do with Autoconf versions, and works for everyone. 2009-11-30 21:38:44 +00:00
Jani Taskinen
d261e6f4a2 - Restore configure.in before the madness started 2009-11-30 14:08:33 +00:00
Jani Taskinen
16450418b1 - Revert bad patch 2009-11-30 08:31:32 +00:00
Gwynne Raskind
477649cd3f re-committing: unsetting LIBS and LDFLAGS just makes it impossible to specify LDFLAGS from the environment. keeping them doesn't seem to cause any trouble 2009-11-30 08:18:44 +00:00
Gwynne Raskind
f275cd0815 once and for all remove the old broken Darwin hack, replace it with the new and much cleaner and simpler one 2009-11-30 08:17:13 +00:00