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

..

build

Merge branch 'PHP-5.5' into PHP-5.6

2014-07-17 21:49:08 +02:00

builddef.bat

…

EngineSelect.bat

…

EngineSelect.dsp

…

flock.c

…

flock.h

…

fnmatch.c

…

fnmatch.h

…

glob.c

backported the VC12 fix for ARG_MAX

2014-07-02 11:11:39 +02:00

glob.h

…

globals.c

Bump year

2014-01-03 11:08:10 +08:00

grp.h

Bump year

2014-01-03 11:08:10 +08:00

inet.c

Remove some pre-vista code

2013-02-02 16:38:09 +01:00

inet.h

Remove some pre-vista code

2013-02-02 16:38:09 +01:00

install.txt

Remove PWS (Personal Web Server) references

2013-07-15 00:38:29 -07:00

param.h

…

php5.dsp

…

php5.dsw

…

php5dll.dsp

Removed Logo GUIDs and replaced with Data URIs and div hidden with JS

2012-07-14 21:44:21 +01:00

php5dllts.dsp

Removed Logo GUIDs and replaced with Data URIs and div hidden with JS

2012-07-14 21:44:21 +01:00

php5dllts.rc

…

php5dllts.rc2

…

php5ts_cli.dsp

…

php5ts_cli.rc

…

php5ts_cli.rc2

…

php5ts.dsp

…

php5ts.dsw

…

php5ts.rc

…

php5ts.rc2

…

php_inttypes.h

better way to fix PRIu64 availability on windows

2013-09-18 15:14:36 +02:00

php_modules.dsw

…

php_registry.h

…

php_stdbool.h

…

php_stdint.h

…

php_strtoi64.h

…

php_win32_globals.h

Bump year

2014-01-03 11:08:10 +08:00

readdir.c

- Fixed possible memory leak

2013-10-12 18:06:20 -03:00

readdir.h

…

registry.c

Fixed compilation on Windows

2014-07-15 15:50:42 +04:00

resource.h

…

select.c

Bump year

2014-01-03 11:08:10 +08:00

select.h

Bump year

2014-01-03 11:08:10 +08:00

sendmail.c

Fixed compilation on Windows

2014-07-15 15:50:42 +04:00

sendmail.h

…

signal.h

Merge branch 'pull-request/341'

2013-06-10 14:30:59 -07:00

sockets.c

Bump year

2014-01-03 11:08:10 +08:00

sockets.h

Bump year

2014-01-03 11:08:10 +08:00

strtoi64.c

…

syslog.h

Bump year

2014-01-03 11:08:10 +08:00

syslog.reg

- 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

testsuite.dsp

…

time.c

Fixed possible precision loss in microtime

2013-03-23 17:40:06 +01:00

time.h

fixed missing usleep() prototype in pgsql

2014-01-22 11:52:52 +01:00

unistd.h

…

winutil.c

Bump year

2014-01-03 11:08:10 +08:00

winutil.h

Bump year

2014-01-03 11:08:10 +08:00

wsyslog.c

fix invalid use of STR_FREE > efree

2014-05-15 10:01:11 +02:00