fe98ffc227
Update UPGRADING and make typo fixes to OCI8 package.xml
2013-07-25 10:54:03 -07:00
c49de17fe5
Merge branch 'PHP-5.5'
2013-07-25 22:46:21 +08:00
9126909c08
Merge branch 'PHP-5.4' into PHP-5.5
2013-07-25 22:44:19 +08:00
9909c4d4c4
Fixed bug #65328 (Segfault when getting SplStack object Value)
2013-07-25 22:43:41 +08:00
bfc3c223da
Initial PHP OCI8 2.0.0-dev commit.
...
Includes Oracle Database 12c Implicit Result Set support, DTrace
support, and various code cleanups.
See package.xml for details.
2013-07-24 15:33:22 -07:00
86064e0701
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix bug #65028 Phar::buildFromDirectory creates corrupt archives for some specific contents
2013-07-23 21:46:23 -07:00
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
96a53f6715
Merge branch 'bug65028' into PHP-5.4
...
* bug65028:
fix bug #65028 Phar::buildFromDirectory creates corrupt archives for some specific contents
2013-07-23 21:44:06 -07:00
7fa841c888
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Expand the ZEND_STRL macro to handle platforms where strncmp() is a macro.
2013-07-23 11:19:02 -07:00
f9000fde98
Expand the ZEND_STRL macro to handle platforms where strncmp() is a macro.
...
On most platforms, this works fine, but on Linux armhf, strncmp() is a macro
rather than a real function, ergo the macro expansion of ZEND_STRL doesn't
occur until after the compiler knows it needs three parameters for strncmp()
and we get a compile error.
Fixes the fix for bug #61697 .
2013-07-23 11:15:43 -07:00
678ef6a133
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix missing include
2013-07-23 18:07:16 +02:00
f00d796b7e
fix missing include
2013-07-23 18:06:51 +02:00
416e270835
Merge branch 'PHP-5.5'
2013-07-23 14:14:18 +02:00
7b92a22772
Fix bug 65299
2013-07-23 14:13:22 +02:00
6b4742582f
Merge branch 'PHP-5.5'
2013-07-23 13:15:15 +02:00
5a8b0ca8fa
Merge branch 'PHP-5.4' into PHP-5.5
2013-07-23 12:57:08 +02:00
c28ab73d73
Fix compiler warning on redefined constant
2013-07-23 12:50:37 +02:00
94e15ff387
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt
2013-07-23 10:00:24 +02:00
8aebe0f1e7
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt
2013-07-23 10:00:07 +02:00
9b6aa268a3
fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt
2013-07-23 09:59:08 +02:00
a48e2bad62
Merge branch 'master' of ssh://git.php.net/php-src
2013-07-22 11:03:10 +02:00
a047ece2e0
Disable a flag
2013-07-22 11:02:48 +02:00
f8efdc2b4b
fix bug #65028 Phar::buildFromDirectory creates corrupt archives for some specific contents
2013-07-22 00:57:33 -07:00
8d2651d8fc
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- addressed bug #65159 , Misleading configure help text for --with-mysql-sock
2013-07-21 23:15:03 -07:00
b8d4a6939e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- addressed bug #65159 , Misleading configure help text for --with-mysql-sock
2013-07-21 23:14:42 -07:00
1b4103c09d
- addressed bug #65159 , Misleading configure help text for --with-mysql-sock
2013-07-21 23:12:54 -07:00
46cc826770
Merge branch 'pull-request/231'
...
* pull-request/231:
update Zend Engine logo as per Zeev, and tweak PHP logos ... :)
fix for scrolling, other minor tweaks
Bump up table width a bit more and make columns consistent
Bringing CSS up to this decade's standards.
2013-07-21 22:49:26 -07:00
e68cd521dc
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix bug #61697 - spl_autoload_functions returns lambda functions incorrectly
2013-07-21 22:48:03 -07:00
83ced9124e
Fix bug #61697 - spl_autoload_functions returns lambda functions incorrectly
2013-07-21 22:47:10 -07:00
3cbb48f055
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Update news for FILTER_SANITIZE_FULL_SPECIAL_CHARS fix
Wrong value for FILTER_SANITIZE_FULL_SPECIAL_CHARS in REGISTER_LONG_CONSTANT
2013-07-21 22:31:37 -07:00
476924ec3d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Update news for FILTER_SANITIZE_FULL_SPECIAL_CHARS fix
Wrong value for FILTER_SANITIZE_FULL_SPECIAL_CHARS in REGISTER_LONG_CONSTANT
2013-07-21 22:31:19 -07:00
da3886de6d
Wrong value for FILTER_SANITIZE_FULL_SPECIAL_CHARS in REGISTER_LONG_CONSTANT
2013-07-21 22:25:21 -07:00
10c547018f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Added recursivetreeiterator::setPostfix() method
2013-07-21 22:22:02 -07:00
5027fa79d7
Added recursivetreeiterator::setPostfix() method
2013-07-21 22:20:58 -07:00
1a05648e6d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
next is 5.5.2
add a few comment
allow both the old and new cfg argument to work. (the old of course should contain the typo)
mssql.compatability_mode fix
Conflicts:
configure.in
main/php_version.h
2013-07-21 21:17:59 -07:00
e7a00a2566
add a few comment
2013-07-21 21:14:38 -07:00
f51b8d8820
allow both the old and new cfg argument to work. (the old of course should contain the typo)
2013-07-21 21:12:19 -07:00
b8941a73cc
mssql.compatability_mode fix
2013-07-21 21:12:16 -07:00
02457554a3
Merge branch 'PHP-5.5'
...
* PHP-5.5:
backward compatibility
HASH_KEY_NON_EXISTANT fix
2013-07-21 20:10:31 -07:00
4749457a49
HASH_KEY_NON_EXISTANT fix
2013-07-21 20:09:53 -07:00
a522f2d1c9
Merge branch 'PHP-5.5'
2013-07-21 21:07:50 +08:00
c7b58e4967
Merge branch 'PHP-5.4' into PHP-5.5
2013-07-21 21:07:27 +08:00
3380de9774
Fixed bug #65304 (Use of max int in array_sum)
2013-07-21 21:07:19 +08:00
cbd1faf077
Merge branch 'PHP-5.5'
...
* PHP-5.5:
intl: remove extra quotes from arginfo params
2013-07-21 03:30:42 +02:00
3363e04fb4
intl: remove extra quotes from arginfo params
2013-07-21 03:30:28 +02:00
cb607d4f78
updated test script for bug #65045 .
2013-07-21 10:18:33 +09:00
c6651942ce
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix header include
new NEWS for next release
2013-07-18 15:29:17 +02:00
d8dd4d9b02
fix header include
...
stddef.h is needed to have offsetof macros on windows (at least)
2013-07-18 15:28:20 +02:00
f7e204d7ed
Slightly modernize ext_skel and sekelton/
...
- .svnignore ->.gitignore
- Add .gitignore entries for DSO stand-alone builds stuff
- Docs don't use CVS but SVN
- reorder extname.c file so it needs less forward declarations
- take forward declarations out of php_extname.h
- Drop #if for 12 years old PHP version compatibility
2013-07-17 23:18:13 +02:00
b594949144
Merge branch 'PHP-5.5'
...
* PHP-5.5:
regenerate url scanner
Fixed bug #50308 - session id not appended properly for empty anchor tags
2013-07-17 16:28:12 +01:00
Christopher Jones