archived-php-src

mirror of https://github.com/php/php-src.git synced 2026-03-26 01:02:25 +01:00

Go to file

Felipe Pena 4dc9545aaa Merge branch 'PHP-5.4'

* PHP-5.4:
  - Fixed bug #61978 (Object recursion not detected for classes that implement JsonSerializable)

2012-05-08 21:06:15 -03:00

build

Fix building of pure C++ extensions as static

2011-08-09 18:12:06 +00:00

ext

Merge branch 'PHP-5.4'

2012-05-08 21:06:15 -03:00

main

Merge branch 'PHP-5.4'

2012-05-06 13:40:06 +02:00

netware

sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php

2010-01-03 09:23:27 +00:00

pear

Removed safe_mode

2010-04-26 23:53:30 +00:00

sapi

Merge branch 'PHP-5.4'

2012-05-08 22:09:13 +02:00

scripts

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

tests

Merge branch 'PHP-5.4'

2012-04-16 15:16:43 +02:00

TSRM

Fixed bug #51860 (Include fails with toplevel symlink to /)

2012-01-30 10:08:11 +00:00

win32

Merge branch 'PHP-5.4'

2012-04-14 00:31:29 +02:00

Zend

Merge branch 'PHP-5.4'

2012-05-03 22:40:51 +08:00

.gdbinit

Fix wrong type in the marco of fetching thread globals

2012-03-11 15:12:28 +00:00

.gitattributes

Merge .gitattributes EOL commit from 5.3.

2012-04-10 19:45:18 +01:00

.gitignore

Ignore the tempoary files

2012-03-22 17:22:17 +08:00

acinclude.m4

Merge branch 'PHP-5.3' into PHP-5.4

2012-04-03 02:00:23 +09:00

buildconf

Make "buildconf --force" more robust, per IRC chat. Not backported to 5.3 to avoid destabilization.

2012-03-06 21:30:59 +00:00

buildconf.bat

MFH: Check if configure script was copied, and output an error if it wasn't

2009-01-02 12:18:21 +00:00

CODING_STANDARDS

Multi-branch test commit to see if email notifications are working

2009-07-17 04:26:33 +00:00

config.guess

- Upgraded bundled libtool to 1.5.26

2009-11-23 21:53:30 +00:00

config.sub

- Upgraded bundled libtool to 1.5.26

2009-11-23 21:53:30 +00:00

configure.in

Merge branch 'PHP-5.3' into PHP-5.4

2012-05-03 12:22:39 -07:00

CREDITS

…

EXTENSIONS

Added myself as curl maintainer

2011-12-04 16:46:45 +00:00

footer

…

genfiles

- Give Marcus good old warm and fuzzy feeling.. :)

2008-03-26 15:04:57 +00:00

header

- Year++

2012-01-01 13:15:04 +00:00

INSTALL

Regenerate from the doc sources

2011-04-27 09:29:10 +00:00

LICENSE

Bump copyright year.

2012-03-20 11:14:59 +01:00

ltmain.sh

- Upgraded bundled libtool to 1.5.26

2009-11-23 21:53:30 +00:00

makedist

fix makedist for new tags

2012-03-30 00:01:52 -07:00

Makefile.frag

fix gcov build

2008-03-19 23:24:56 +00:00

Makefile.gcov

fix race condition in find (it was finding the copied files over and over again, and recursing forever)

2012-02-20 16:01:34 +00:00

Makefile.global

- Implemented FR #53271 , FR #52410 (Building multiple PHP binary SAPIs and one SAPI module the same time)

2010-11-13 23:13:07 +00:00

makerpm

- Change from PHP5 -> PHP 5

2004-02-08 22:49:47 +00:00

NEWS

Fix #61704 (Crash apache, phpinfo() threading issue)

2012-05-08 17:30:05 +02:00

php5.spec.in

- Renamed all *php4* files to *php5*, changed all php4/PHP4 to php5/PHP5

2004-01-17 13:00:38 +00:00

php.gif

fix logo (proper spacing between the letters)

2006-03-06 19:10:19 +00:00

php.ini-development

Merge branch 'PHP-5.4'

2012-04-19 00:08:42 +02:00

php.ini-production

Merge branch 'PHP-5.4'

2012-04-19 00:08:42 +02:00

README.EXT_SKEL

update the docs

2008-06-19 17:59:35 +00:00

README.EXTENSIONS

…

README.GIT-RULES

Move and update README.SVN-RULES to README.GIT-RULES

2012-04-13 02:12:47 +02:00

README.input_filter

Merge branch 'PHP-5.3' into PHP-5.4

2012-03-20 17:58:58 +01:00

README.MAILINGLIST_RULES

MFH

2008-01-17 14:38:16 +00:00

README.namespaces

- MFH: Changed namespace separator

2009-04-03 14:37:02 +00:00

README.NEW-OUTPUT-API

fix protos, and unintential double-patched content

2010-05-31 13:54:13 +00:00

README.PARAMETER_PARSING_API

- Added 'p' type specifier

2011-06-07 22:22:01 +00:00

README.PHP4-TO-PHP5-THIN-CHANGES

new incompatibilities. maybe someone from the doc group will update the

2004-08-24 22:01:58 +00:00

README.REDIST.BINS

- update blowfish to 1.2 (Solar Designer)

2011-07-18 21:26:29 +00:00

README.RELEASE_PROCESS

fix RCs

2012-04-19 10:45:21 -07:00

README.SELF-CONTAINED-EXTENSIONS

…

README.STREAMS

…

README.SUBMITTING_PATCH

Restructure into PHP/PECL/PEAR component areas (at the expense of duplication)

2010-05-11 18:25:44 +00:00

README.TESTING

clarification of wwwhether 'make test' needs the PHP xecutable to be set

2009-03-20 15:43:40 +00:00

README.TESTING2

Fixed bug#46445 (run-tests2.php is missing or README.TESTING2 is unneeded)

2008-11-05 17:15:50 +00:00

README.UNIX-BUILD-SYSTEM

Update documentation for PHP 5.

2003-07-03 04:14:42 +00:00

README.WIN32-BUILD-SYSTEM

- if they are outdated/wrong, no need to confuse the users

2010-02-04 08:24:29 +00:00

run-tests.php

Refactoring junit logger. Added generation of nested testsuites in junit.xml.

2012-03-28 21:39:24 +01:00

server-tests-config.php

- MFH Fix filename

2005-09-19 19:03:53 +00:00

server-tests.php

sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php

2010-01-03 09:23:27 +00:00

snapshot

…

stamp-h.in

…

stub.c

…

svnclean.bat

- rename to svn

2009-07-13 16:10:29 +00:00

UPGRADING

Fixed bug #61038 ; "Z" and better behavior for unpack()

2012-04-17 21:09:04 +01:00

UPGRADING.INTERNALS

- Cleanup UPGRADING and UPGRADING.INTERNALS from 5.4 changes.

2012-02-22 10:08:37 +00:00

vcsclean

MFH: dropped some more mime types, svnclean -> clean for multiple VCS

2009-07-16 04:50:06 +00:00

README.WIN32-BUILD-SYSTEM

The Win32 Build System.

See http://wiki.php.net/internals/windows/stepbystepbuild 

vim:tw=78:sw=1:ts=1:et

Languages

C 66%

PHP 31.3%

C++ 0.8%

Shell 0.5%

M4 0.4%

Other 0.8%