David Soria Parra
45f4305605
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Update RELEASE PROCESS
2012-09-13 20:24:09 +02:00
David Soria Parra
1f9a1c1cf3
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Update RELEASE PROCESS
2012-09-13 20:23:05 +02:00
David Soria Parra
33fcec5c4f
Update RELEASE PROCESS
...
Some parts of the release process are outdated, not needed anymore
or still reference cvs.
2012-09-13 20:19:23 +02:00
Johannes Schlüter
cebd084182
Merge branch 'PHP-5.4'
2012-09-12 23:35:40 +02:00
Johannes Schlüter
b93675d60b
Merge branch 'PHP-5.3' into PHP-5.4
2012-09-12 23:35:29 +02:00
Johannes Schlüter
0cc0f73fc3
fix NEWS after releses
2012-09-12 23:35:05 +02:00
Johannes Schlüter
fa014e07bf
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
2012-09-12 23:05:24 +02:00
Johannes Schlüter
7ae66c5a16
Merge branch 'master' of git.php.net:/php-src
2012-09-12 23:01:11 +02:00
Gustavo André dos Santos Lopes
5246d6f02e
Generators & UPGRADING
2012-09-12 09:05:28 +01:00
Xinchen Hui
f6000a01e2
Capitalize the warning message
2012-09-11 18:09:47 +08:00
Xinchen Hui
79e6635cb6
Rearrange the codes, remove empty lines
2012-09-11 18:02:19 +08:00
Xinchen Hui
0146efbd41
Merge branch 'invalid-timezone' of https://github.com/simonwelsh/php-src
2012-09-11 17:58:20 +08:00
Simon Welsh
e06c47ca2a
Provide a specific error message if date.timezone value is invalid.
2012-09-11 21:45:09 +12:00
Xinchen Hui
7e64681740
Merge branch 'PHP-5.4'
2012-09-11 11:44:33 +08:00
Xinchen Hui
328a3d9f13
regenerate patch, and save a strlen
2012-09-11 11:43:47 +08:00
Xinchen Hui
b5c2f532af
Merge branch 'PHP-5.4'
2012-09-10 23:11:28 +08:00
Xinchen Hui
0a25a0241e
Fix the wrong use of snprintf which is introduced in 1d2f619049
2012-09-10 23:08:54 +08:00
Dmitry Stogov
04789300a4
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed unintendent clearance of PHP_OUTPUT_ACTIVATED flag
2012-09-10 14:57:45 +04:00
Dmitry Stogov
62d86209cf
Fixed unintendent clearance of PHP_OUTPUT_ACTIVATED flag
2012-09-10 14:54:18 +04:00
Adam Harvey
6dca491a74
Merge branch 'PHP-5.4'
2012-09-10 10:06:23 +08:00
Adam Harvey
58d6a42528
Merge branch 'PHP-5.3' into PHP-5.4
2012-09-10 10:06:10 +08:00
Adam Harvey
f66642aae1
Fix doc bug #63032 (Number of release in documentation).
...
Also add a bonus grammar fix.
2012-09-10 10:05:15 +08:00
Anatoliy Belsky
b815676494
Merge branch 'PHP-5.4'
...
* PHP-5.4:
fixed test for bug #52944 also for darwin
2012-09-09 23:03:47 +02:00
Reeze Xia
57bebfcbdc
fixed test for bug #52944 also for darwin
2012-09-09 23:02:50 +02:00
unknown
80a2f2f68e
Merge branch 'PHP-5.4'
...
* PHP-5.4:
-enable VC11 (vc2012)
2012-09-08 18:48:32 +02:00
unknown
cea7f09043
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
-enable VC11 (vc2012)
2012-09-08 18:47:32 +02:00
unknown
dabe89c6f3
-enable VC11 (vc2012)
2012-09-08 18:46:33 +02:00
Dmitry Stogov
d4d82aac39
Merge branch 'PHP-5.4'
...
* PHP-5.4:
- Fixed bug #61767 (Shutdown functions not called in certain error situation) - Fixed bug #60909 (custom error handler throwing Exception + fatal error = no shutdown function)
Conflicts:
NEWS
2012-09-06 14:03:22 +04:00
Dmitry Stogov
6ba376f552
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- Fixed bug #61767 (Shutdown functions not called in certain error situation) - Fixed bug #60909 (custom error handler throwing Exception + fatal error = no shutdown function)
Conflicts:
NEWS
Zend/zend_object_handlers.c
2012-09-06 12:14:29 +04:00
Dmitry Stogov
b29dc146b9
- Fixed bug #61767 (Shutdown functions not called in certain error situation)
...
- Fixed bug #60909 (custom error handler throwing Exception + fatal error = no shutdown function)
2012-09-06 11:26:40 +04:00
Xinchen Hui
12191a9f36
Merge branch 'PHP-5.4'
2012-09-05 23:48:54 +08:00
Xinchen Hui
a43c45ea7d
Merge branch 'PHP-5.3' into PHP-5.4
2012-09-05 23:48:27 +08:00
Xinchen Hui
94582f9398
year++
...
missed the .re files in 5.3
2012-09-05 23:47:51 +08:00
Xinchen Hui
d22f18007f
Merge branch 'PHP-5.4'
2012-09-05 23:44:41 +08:00
Xinchen Hui
a3d078bd8f
correct PHP version & year++
2012-09-05 23:43:59 +08:00
Xinchen Hui
b9dec59b07
Merge branch 'PHP-5.3' into PHP-5.4
2012-09-05 23:42:45 +08:00
Xinchen Hui
5f9023ca38
Correct PHP version
2012-09-05 23:41:42 +08:00
Xinchen Hui
63d9c1f40b
Merge branch 'PHP-5.4'
...
Conflicts:
sapi/litespeed/lsapi_main.c
2012-09-05 23:20:42 +08:00
Xinchen Hui
9d44ff640c
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
ext/interbase/interbase.rc
2012-09-05 23:11:19 +08:00
Xinchen Hui
d64d9e3351
year++
2012-09-05 23:08:05 +08:00
Pierre Joye
2b7bddd82a
Merge branch 'PHP-5.4'
...
* PHP-5.4:
- fix build, there was no tsrm context there, doing a fetch but this is horribly slow, this fix needs improvement (or simply add a TSRM context in the signature in master
2012-09-05 13:00:41 +02:00
Pierre Joye
954e7a3b3c
- fix build, there was no tsrm context there, doing a fetch but this is horribly slow, this fix needs improvement (or simply add a TSRM context in the signature in master
2012-09-05 13:00:04 +02:00
Pierre Joye
4a7d1b4ed8
- fix build, declarations must be 1st in a contextgit checkout -f master
2012-09-05 12:53:29 +02:00
Dmitry Stogov
bceec038c8
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed bug #62907 (Double free when use traits)
Conflicts:
NEWS
2012-09-05 10:01:04 +04:00
Dmitry Stogov
6c0508f8d5
Fixed bug #62907 (Double free when use traits)
2012-09-05 09:58:22 +04:00
Dmitry Stogov
061f3799eb
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
forked two tests for windows
2012-09-05 09:55:14 +04:00
Dmitry Stogov
72473962a9
Fixed bug #62991 (Segfault with generator and closure)
2012-09-05 09:50:55 +04:00
Anatoliy Belsky
4b206126ac
Merge branch 'PHP-5.4'
...
* PHP-5.4:
forked two tests for windows
2012-09-03 13:48:02 +02:00
Anatoliy Belsky
ff0aa24054
forked two tests for windows
...
* bug55544.phpt - VT vs. EXT at the start of the data block,
but the data can still be decoded correctly
* bug_52944.phpt works with the corrupted data and has some
different out
Most likely the ASM optimization under windows is responsible
for this behaviour.
2012-09-03 13:37:34 +02:00
Dmitry Stogov
2a57a25636
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice).
2012-09-03 12:00:19 +04:00