php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-27 01:48:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
109,890 Commits 549 Branches 1,485 Tags
3ecaba68e4caaff967efb4e043af2eb78090112c
Commit Graph

109890 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xinchen Hui 3ecaba68e4 Merge branch 'PHP-7.3' 
* PHP-7.3:
  Fix __zend_cpuid on i386 PIC without __cpuid_count
 2018-12-11 15:23:25 +08:00
Xinchen Hui c3eb291e41 Merge branch 'i386-PIC' of https://github.com/ryandesign/php-src into PHP-7.3 
* 'i386-PIC' of https://github.com/ryandesign/php-src:
  Fix __zend_cpuid on i386 PIC without __cpuid_count
 2018-12-11 15:22:50 +08:00
Anatol Belski 282581ee8c Merge branch 'PHP-7.3' 
* PHP-7.3:
  Remove BOM
 2018-12-11 00:39:55 +01:00
Anatol Belski 7dc1c7f630 Remove BOM 2018-12-11 00:38:54 +01:00
Christoph M. Becker ad06f1aa2e Merge branch 'PHP-7.3' 
* PHP-7.3:
  Update/fix UPGRADING
 2018-12-10 14:33:04 +01:00
Christoph M. Becker 9b335c5649 Update/fix UPGRADING 2018-12-10 14:32:20 +01:00
Nikita Popov 6debea2fd8 Merge branch 'PHP-7.3' 2018-12-10 13:36:54 +01:00
Nikita Popov 93aabf1533 Fixed bug #77275 
Instead of juggling with this problem during literal compaction,
make sure that we always initialize Z_EXTRA for literals, which
seems like the more robust solution.
 2018-12-10 13:36:23 +01:00
Nikita Popov 59cacdcefd Fix typos in compact literals debugging code 2018-12-10 13:35:55 +01:00
Christopher Jones be318f1720 Merge branch 'PHP-7.3' 2018-12-10 21:54:35 +11:00
Christopher Jones 6f6a15e1ae Merge branch 'PHP-7.2' into PHP-7.3 2018-12-10 21:54:23 +11:00
Christopher Jones 3aee9ca571 LOL I had 2.10 on my mind 2018-12-10 21:54:13 +11:00
Peter Kokot 7e445ef3b1 Set AC_CONFIG_AUX_DIR to build directory 
The Autoconf macro AC_CONFIG_AUX_DIR can set the location of the
auxiliary build tools such as config.guess, config.sub, and bundled
libtool scripts and moves these bundled files from the root directory
to the build subdirectory.

Additionally some changes in this context or as a part of obsoletion:
- The LT_TARGETS variable in build/build2.mk file was once used as a part
  of the Automake step. It's not used anymore and has been refactored to
  separate makedist script directly.
- ltconfig is not used anymore since libtool 1.4+
  cf8d1563c2
- phpize file locations for the config.guess, config.sub, and ltmain.sh
  has been refactored accordingly.
 2018-12-10 08:11:44 +01:00
Christopher Jones a680f4f2be Link to the fast_zpp RFC 2018-12-10 12:53:12 +11:00
Christopher Jones 46a4bc140d Merge branch 'master' of https://git.php.net/repository/php-src 2018-12-10 11:00:38 +11:00
Christopher Jones 5b72f49c9e Merge branch 'PHP-7.3' of https://git.php.net/repository/php-src into PHP-7.3 2018-12-10 11:00:32 +11:00
Christopher Jones 211b64f950 Merge branch 'PHP-7.3' 2018-12-10 10:58:44 +11:00
Christopher Jones 95581c6dd9 Merge branch 'PHP-7.2' into PHP-7.3 2018-12-10 10:57:10 +11:00
Christopher Jones 444e400c3b Bundle the new test 2018-12-10 10:45:43 +11:00
Christoph M. Becker 222b7e78e3 Merge branch 'PHP-7.3' 
* PHP-7.3:
  Fix version numbers in main branch
 2018-12-10 00:21:59 +01:00
Christopher Jones c18d2a801a Merge branch 'PHP-7.3' 
* PHP-7.3:
  Improve test portability
  Update for newer Oracle versions
 2018-12-10 10:16:53 +11:00
Christopher Jones e47025ffc5 Merge branch 'PHP-7.2' into PHP-7.3 2018-12-10 10:16:27 +11:00
Christoph M. Becker b0177d3892 Fix version numbers in main branch 
This should have already happened, when `PHP-7.3.0` was branched.
 2018-12-10 00:16:23 +01:00
Christopher Jones e4d894edb3 Improve test portability 2018-12-10 10:16:15 +11:00
Christopher Jones 56e2c0d7db Update for newer Oracle versions 2018-12-10 10:15:53 +11:00
Anatol Belski 2598dd5ca2 Merge branch 'PHP-7.3' 
* PHP-7.3:
  Fix syntax error
 2018-12-09 19:15:57 +01:00
Anatol Belski 6734b1106f Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix syntax error
 2018-12-09 19:15:11 +01:00
Anatol Belski 81207fc607 Fix syntax error 2018-12-09 19:13:09 +01:00
Anatol Belski 94200f1a2d Merge branch 'PHP-7.3' 
* PHP-7.3:
  Fix libtidy exports when ext/tidy compiled static
 2018-12-09 19:02:18 +01:00
Anatol Belski be599873f0 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix libtidy exports when ext/tidy compiled static
 2018-12-09 19:01:17 +01:00
Anatol Belski 0d166f76ee Fix libtidy exports when ext/tidy compiled static 2018-12-09 18:59:05 +01:00
Eli Schwartz 78e4f04752 ext/curl: port to pkg-config macro and consistently require its use 
curl 7.15.1 in December 2006 first added pkg-config support, which is
earlier than the minimum supported version for php. This should
therefore be uiversally supported.
 2018-12-09 17:28:02 +01:00
Derick Rethans c74b9990ca Merge branch 'PHP-7.3' 2018-12-09 16:25:37 +00:00
Derick Rethans 77b1f5baa3 Back to -dev 
This should have been done as soon as PHP-7.3.0 was branched.
 2018-12-09 16:23:31 +00:00
Eli Schwartz bdd4eb2d9e ext/pdo_pgsql: drop unneeded code 
This check was added in 0db373883f and
greps for a private implementation detail of the postgres headers,
removed in https://github.com/postgres/postgres/commit/3c4768d0d17d4569f2417aa5741e0317404b6c45

It hasn't worked as intended for 12 years, and can safely be assumed to
not be needed.
 2018-12-09 17:15:58 +01:00
Nikita Popov 30024071d2 Fix unused variable warning in curl 2018-12-09 17:05:02 +01:00
Hugh McMaster 20fa2e7b58 ext/intl: Use pkg-config to detect icu 
The developers of icu recommend using pkg-config to detect icu,
because icu-config is deprecated.
 2018-12-09 16:59:24 +01:00
Christopher Jones 02513f1075 Merge branch 'PHP-7.3' 2018-12-09 20:56:48 +11:00
Christopher Jones 8c37d5f451 Add OCI8 changes 2018-12-09 20:56:25 +11:00
Christopher Jones 1f84f2a766 Merge branch 'PHP-7.2' into PHP-7.3 2018-12-09 20:55:21 +11:00
Christopher Jones 99f1f3dedf Add oci_set_call_timeout() and bump version to 2.10.0 2018-12-09 20:55:04 +11:00
Christopher Jones b2a1c14dcd Merge branch 'PHP-7.3' 2018-12-09 12:39:02 +11:00
Christopher Jones 31eeca8a19 Merge branch 'PHP-7.2' into PHP-7.3 2018-12-09 12:38:53 +11:00
Christopher Jones e2ecd60f2f Upgrade internal OCI call 2018-12-09 12:38:35 +11:00
Christopher Jones 36efc39db1 Merge branch 'PHP-7.3' 2018-12-09 12:17:23 +11:00
Christopher Jones 3da368be2e Merge branch 'PHP-7.2' into PHP-7.3 2018-12-09 12:17:04 +11:00
Christopher Jones 4246702406 Enable Oracle Database DBOP tracing attribute 2018-12-09 12:16:47 +11:00
Christopher Jones ecd533d1de Merge branch 'PHP-7.3' 2018-12-09 11:30:47 +11:00
Christopher Jones 03f6b16de7 Merge branch 'PHP-7.2' into PHP-7.3 2018-12-09 11:30:15 +11:00
Christopher Jones 465c149cd3 Update OCI8 README 2018-12-09 11:28:52 +11:00